Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv24075
Modified Files:
configure.ac configure.in
Log Message:
Nathan Walp says this is better.
Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- configure.ac 19 May 2002 19:09:15 -0000 1.69
+++ configure.ac 30 May 2002 18:33:40 -0000 1.70
@@ -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>
Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- configure.in 19 May 2002 19:09:15 -0000 1.113
+++ configure.in 30 May 2002 18:33:40 -0000 1.114
@@ -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>
|
