X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=b6c7803f61b02074705c7cfb5bbc72fe27d71d46;hb=a76e91eb2a514dbd35ad9a9a81308acc7fc5bd89;hp=1dd2669fa0a9f567061d3c54300cc36d6d212ae8;hpb=af47a406171a280f7d19a5d5d870b2d810b48ef5;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 1dd2669f..b6c7803f 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL -AM_GNU_GETTEXT_VERSION(0.12.1) +AM_GNU_GETTEXT_VERSION(0.15) AM_GNU_GETTEXT([external]) AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h) @@ -84,8 +84,8 @@ AC_SUBST(XML_LIBS) AC_ARG_ENABLE(startup-notification, AC_HELP_STRING( - [--enable-startup-notification], - [enable the startup notification library. [[default=enabled]]] + [--disable-startup-notification], + [disable the startup notification library. [[default=enabled]]] ), [enable_sn=$enableval], [enable_sn=yes] @@ -107,6 +107,31 @@ else sn_found=no fi +AC_ARG_ENABLE(xcursor, + AC_HELP_STRING( + [--disable-xcursor], + [disable use of the X Cursor library. [[default=enabled]]] + ), + [enable_xcursor=$enableval], + [enable_xcursor=yes] +) + +if test "$enable_xcursor" = yes; then +PKG_CHECK_MODULES(XCURSOR, [xcursor], + [ + AC_DEFINE(USE_XCURSOR, [1], [Use X Cursor library]) + AC_SUBST(XCURSOR_CFLAGS) + AC_SUBST(XCURSOR_LIBS) + xcursor_found=yes + ], + [ + xcursor_found=no + ] +) +else + xcursor_found=no +fi + dnl Check for session management X11_SM @@ -119,6 +144,7 @@ X11_EXT_XKB X11_EXT_XRANDR X11_EXT_SHAPE X11_EXT_XINERAMA +X11_EXT_SYNC AC_CONFIG_FILES([ Makefile @@ -133,6 +159,7 @@ AC_OUTPUT AC_MSG_RESULT AC_MSG_RESULT([Compiling with these options: Startup Notification... $sn_found + X Cursor Library... $xcursor_found Session Management... $SM ]) AC_MSG_RESULT([configure complete, now type "make"])