changeset
[gaim-migrate @ 3300]
Thu, 30 May 2002 18:33:40 +0000
- author
- Nathan Walp <nwalp@pidgin.im>
- date
- Thu, 30 May 2002 18:33:40 +0000
- changeset 3282
- 4be464d51ca3
- parent 3281
- 5ad43d7d85ba
- child 3283
- 645563315be3
[gaim-migrate @ 3300]
Nathan Walp says this is better.
committer: Sean Egan <seanegan@pidgin.im>
| configure.ac | file | annotate | diff | comparison | revisions | |
| configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.ac Thu May 30 17:49:03 2002 +0000 +++ b/configure.ac Thu May 30 18:33:40 2002 +0000 @@ -236,12 +236,13 @@ dnl Check for XScreenSaver if test "x$enable_xss" = "xyes" ; then + AC_PATH_X old_LIBS="$LIBS" - LIBS="$LIBS $UI_LIBS" + LIBS="$LIBS $UI_LIBS -L$x_libraries" XSS_LIBS="no" XSS_HEADERS="no" - AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[],[-lX11 -lXext -lm]) - AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries -lXss"],[],[-lX11 -lXext -lm]) if test \! "$XSS_LIBS" = "no"; then AC_TRY_COMPILE([ #include <X11/extensions/scrnsaver.h>
--- a/configure.in Thu May 30 17:49:03 2002 +0000 +++ b/configure.in Thu May 30 18:33:40 2002 +0000 @@ -235,11 +235,11 @@ dnl Check for XScreenSaver if test "x$enable_xss" = "xyes" ; then old_LIBS="$LIBS" - LIBS="$LIBS $UI_LIBS" + LIBS="$LIBS $UI_LIBS -L$x_libraries" XSS_LIBS="no" XSS_HEADERS="no" - AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[],[-lX11 -lXext -lm]) - AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L%x_libraries -lXss"],[],[-lX11 -lXext -lm]) if test \! "$XSS_LIBS" = "no"; then AC_TRY_COMPILE([ #include <X11/extensions/scrnsaver.h>
