[Gaim-commits] CVS: gaim configure.ac,1.107,1.108

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv11031

Modified Files:
	configure.ac 
Log Message:
Aaron Namba (musicmanan) writes:
" I am using target i386-unknown-freebsd4.7 with perl
5.00503. I had to modify src/perl.c slightly to get it
libintl.a to link properly. I got this idea from
http://archive.develooper.com/pe...@pe.../msg00773.html,
not sure whether it was the proper thing to do. But
gaim seems to work properly.

Here's the diff... "


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- configure.ac	16 Mar 2003 00:01:14 -0000	1.107
+++ configure.ac	25 Mar 2003 01:20:34 -0000	1.108
@@ -149,7 +149,7 @@
 AC_PATH_PROG(gaimpath, gaim)
 CFLAGS="$CFLAGS $GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 
-AC_PATH_X
+AC_PATH_XTRA
 
 dnl Check for XScreenSaver
 if test "x$enable_xss" = "xyes" ; then
@@ -157,14 +157,15 @@
 	LIBS="$LIBS $GTK_LIBS -L$x_libraries"
 	XSS_LIBS="no"
 	XSS_HEADERS="no"
-	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])
+	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm])
 	if test \! "$XSS_LIBS" = "no"; then
 		AC_TRY_COMPILE([
+#include <X11/Xlib.h>
 #include <X11/extensions/scrnsaver.h>
-				],[],[enable_xss=no],[
-				AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
-				])
+				],[],[
+				AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])],[enable_xss=no]
+				)
 	else
 	       XSS_LIBS=""
 	       enable_xss=no