comparison configure.in @ 1120:124e9f0b9af5

[gaim-migrate @ 1130] Need to use AC_TRY_COMPILE instead of AC_CHECK_HEADER to get CFLAGS for X headers in case if they are not in a good place. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 22 Nov 2000 06:25:20 +0000
parents 3deadbe50737
children 201ec77f3a60
comparison
equal deleted inserted replaced
1119:ba292594e938 1120:124e9f0b9af5
101 AM_PATH_GLIB(1.2.0) 101 AM_PATH_GLIB(1.2.0)
102 AM_PATH_GTK(1.2.0,,,gthread) 102 AM_PATH_GTK(1.2.0,,,gthread)
103 LIBS="$LIBS $GTK_LIBS" 103 LIBS="$LIBS $GTK_LIBS"
104 AC_PATH_PROG(gaimpath, gaim) 104 AC_PATH_PROG(gaimpath, gaim)
105 fi 105 fi
106 CFLAGS="$CFLAGS $GTK_CFLAGS"
106 107
107 dnl Check for XScreenSaver 108 dnl Check for XScreenSaver
108 if test "x$enable_xss" = "xyes" ; then 109 if test "x$enable_xss" = "xyes" ; then
109 XSS_LIBS="no" 110 XSS_LIBS="no"
110 XSS_HEADERS="no" 111 XSS_HEADERS="no"
111 AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[],[-lX11 -lXext -lm]) 112 AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[],[-lX11 -lXext -lm])
112 AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm]) 113 AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm])
113 if test \! "$XSS_LIBS" = "no"; then 114 if test \! "$XSS_LIBS" = "no"; then
114 AC_CHECK_HEADER(X11/extensions/scrnsaver.h,[XSS_HEADERS="yes"]) 115 AC_TRY_COMPILE([
115 if test "$XSS_HEADERS" = "yes"; then 116 #include <X11/extensions/scrnsaver.h>
116 dnl Found the libs and the headers 117 ],[],[],[
117 AC_DEFINE(USE_SCREENSAVER) 118 AC_DEFINE(USE_SCREENSAVER)
118 LIBS="$LIBS $XSS_LIBS" 119 LIBS="$LIBS $XSS_LIBS"
119 fi 120 ])
120 else 121 else
121 XSS_LIBS="" 122 XSS_LIBS=""
122 fi 123 fi
123 else 124 else
124 XSS_LIBS="" 125 XSS_LIBS=""
125 fi 126 fi
126 127
127 128
128 129
129 130
130 if test "x$enable_multi" != "xyes" ; then 131 if test "x$enable_multi" != "xyes" ; then
131 AC_DEFINE(NO_MULTI) 132 AC_DEFINE(NO_MULTI)
132 fi 133 fi
133
134 CFLAGS="$CFLAGS $GTK_CFLAGS"
135 134
136 if test "x$enable_plugins" = xyes ; then 135 if test "x$enable_plugins" = xyes ; then
137 AC_DEFINE(GAIM_PLUGINS) 136 AC_DEFINE(GAIM_PLUGINS)
138 fi 137 fi
139 138