diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 33217ad..d6d5612 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -194,14 +194,24 @@ dnl Check for networking libraries | |||
194 | AC_CHECK_LIB([nsl], [t_open], [LIBS="-lnsl $LIBS"]) | 194 | AC_CHECK_LIB([nsl], [t_open], [LIBS="-lnsl $LIBS"]) |
195 | AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"]) | 195 | AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"]) |
196 | 196 | ||
197 | dnl Check for X headers and libraries | 197 | #dnl Check for X headers and libraries |
198 | AC_PATH_X | 198 | #AC_PATH_X |
199 | AC_PATH_XTRA | 199 | #AC_PATH_XTRA |
200 | AS_IF([test x$no_x = "xyes"], [ | 200 | #AS_IF([test x$no_x = "xyes"], [ |
201 | # AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.]) | ||
202 | #]) | ||
203 | |||
204 | dnl Check for X11 | ||
205 | PKG_CHECK_MODULES([X11], [ x11 ], | ||
206 | [AC_DEFINE([HAVE_X11], [1], [Define if x11 is available]) have_x11=yes], | ||
207 | [have_x11=no]) | ||
208 | AM_CONDITIONAL([X11], [test "$have_x11" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])) | ||
209 | AS_IF([test x$have_x11 = "xno"], [ | ||
201 | AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.]) | 210 | AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.]) |
202 | ]) | 211 | ]) |
203 | 212 | ||
204 | LIBS="$X_LIBS $LIBS" | 213 | CXXFLAGS="$X11_CFLAGS $CXXFLAGS" |
214 | LIBS="$X11_LIBS $LIBS" | ||
205 | 215 | ||
206 | dnl Check for xpg4 | 216 | dnl Check for xpg4 |
207 | AC_CHECK_LIB([xpg4], [setlocale], [LIBS="-lxpg4 $LIBS"]) | 217 | AC_CHECK_LIB([xpg4], [setlocale], [LIBS="-lxpg4 $LIBS"]) |
@@ -371,12 +381,6 @@ AS_IF([test "x$enable_imlib2" != "xno"], [ | |||
371 | ]) | 381 | ]) |
372 | AM_CONDITIONAL([IMLIB2], [test "$have_imlib2" = "yes"]) | 382 | AM_CONDITIONAL([IMLIB2], [test "$have_imlib2" = "yes"]) |
373 | 383 | ||
374 | dnl Check for X11 | ||
375 | PKG_CHECK_MODULES([X11], [ x11 ], | ||
376 | [AC_DEFINE([HAVE_X11], [1], [Define if x11 is available]) have_x11=yes], | ||
377 | [have_x11=no]) | ||
378 | AM_CONDITIONAL([X11], [test "$have_x11" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])) | ||
379 | |||
380 | dnl Check for X fonts | 384 | dnl Check for X fonts |
381 | have_xft=no | 385 | have_xft=no |
382 | AC_ARG_ENABLE([xft], AS_HELP_STRING([--disable-xft], [disable xft support])) | 386 | AC_ARG_ENABLE([xft], AS_HELP_STRING([--disable-xft], [disable xft support])) |