Mercurial > pidgin

comparison configure.ac @ 5344:fda2d94b9434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5720] Tim Mooney (enchanter) writes: "configure.ac calls AC_PATH_XTRA and then assumes $x_libraries will be set. You can't rely on this, because on platforms where the libraries and headers are in places that the development toolchain searches by default, configure will *NOT* set $x_libraries or $x_includes. This incorrect assumption causes configure to miss several X-related tests, and it causes the final link to fail on platforms like Tru64 UNIX or Solaris (and likely others)." as this did not break my compile, i'm going ahead and committing this. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 10 May 2003 12:47:17 +0000
parents 2d58a9a46292
children 9f4e2a0d3420
comparison
equal deleted inserted replaced
5343:2e5462a322b8 5344:fda2d94b9434
148 148
149 AC_PATH_PROG(gaimpath, gaim) 149 AC_PATH_PROG(gaimpath, gaim)
150 CFLAGS="$CFLAGS $GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" 150 CFLAGS="$CFLAGS $GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
151 151
152 AC_PATH_XTRA 152 AC_PATH_XTRA
153 # We can't assume that $x_libraries will be set, because autoconf does not
154 # set it in the case when the X libraries are in a standard place.
155 # Ditto for $x_includes
156 if test X"$x_libraries" = X"" ; then
157 x_libpath_add=
158 else
159 x_libpath_add="-L$x_libraries"
160 fi
161 if test X"$x_includes" = X"" ; then
162 x_incpath_add=
163 else
164 x_incpath_add="-I$x_includes"
165 fi
153 166
154 dnl Check for XScreenSaver 167 dnl Check for XScreenSaver
155 if test "x$enable_xss" = "xyes" ; then 168 if test "x$enable_xss" = "xyes" ; then
156 old_LIBS="$LIBS" 169 old_LIBS="$LIBS"
157 LIBS="$LIBS $GTK_LIBS -L$x_libraries" 170 LIBS="$LIBS $GTK_LIBS $x_libpath_add"
158 XSS_LIBS="no" 171 XSS_LIBS="no"
159 XSS_HEADERS="no" 172 XSS_HEADERS="no"
160 AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm]) 173 AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm])
161 AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm]) 174 AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm])
162 if test \! "$XSS_LIBS" = "no"; then 175 if test \! "$XSS_LIBS" = "no"; then
179 192
180 193
181 dnl Check for X session management libs 194 dnl Check for X session management libs
182 if test "x$enable_sm" = "xyes"; then 195 if test "x$enable_sm" = "xyes"; then
183 enable_sm=no 196 enable_sm=no
184 AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [-L$x_libraries -lICE]) 197 AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [$x_libpath_add -lICE])
185 if test "$found_sm_lib" = "true"; then 198 if test "$found_sm_lib" = "true"; then
186 AC_CHECK_HEADERS(X11/SM/SMlib.h, SM_LIBS="-L$x_libraries -lSM -lICE" enable_sm=yes) 199 AC_CHECK_HEADERS(X11/SM/SMlib.h, SM_LIBS="$x_libpath_add -lSM -lICE" enable_sm=yes)
187 fi 200 fi
188 else 201 else
189 SM_LIBS="" 202 SM_LIBS=""
190 enable_sm=no 203 enable_sm=no
191 fi 204 fi