summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2009-04-03 17:02:57 +0200
committerJulien Danjou <julien@danjou.info>2009-04-03 17:02:57 +0200
commit57816a46aa32d0bd667661ce6aaaa187f84ec889 (patch)
treed5b09c5af774ed52100d5a91f154b393dec29e05 /configure.in
parentfc0f1dac23320c2cf9dab6e5023e74e9aa0e3132 (diff)
downloadstartup-notification-57816a46aa32d0bd667661ce6aaaa187f84ec889.tar.gz
XCB is no more an option
This is the simplest way to have an ABI which does not depend on a compilation option, which is bad. Signed-off-by: Julien Danjou <julien@danjou.info>
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in22
1 files changed, 8 insertions, 14 deletions
diff --git a/configure.in b/configure.in
index 398efa0..21fe138 100644
--- a/configure.in
+++ b/configure.in
@@ -78,20 +78,14 @@ fi
## try definining HAVE_BACKTRACE
AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
-AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [build with XCB library]))
-
-if test "x$with_xcb" = "xyes"; then
- PKG_CHECK_MODULES([xcb], [xcb],,
- [AC_MSG_ERROR([Cannot find xcb])])
- PKG_CHECK_MODULES([xcb_aux], [xcb-aux],,
- [AC_MSG_ERROR([Cannot find xcb-aux])])
- PKG_CHECK_MODULES([xcb_event], [xcb-event],,
- [AC_MSG_ERROR([Cannot find xcb-event])])
- PKG_CHECK_MODULES([xcb_atom], [xcb-atom],,
- [AC_MSG_ERROR([Cannot find xcb-atom])])
- AC_DEFINE([HAVE_XCB],1,[Defined to use xcb])
-fi
-AM_CONDITIONAL(WITH_XCB, test "x$with_xcb" = "xyes")
+PKG_CHECK_MODULES([xcb], [xcb],,
+ [AC_MSG_ERROR([Cannot find xcb])])
+PKG_CHECK_MODULES([xcb_aux], [xcb-aux],,
+ [AC_MSG_ERROR([Cannot find xcb-aux])])
+PKG_CHECK_MODULES([xcb_event], [xcb-event],,
+ [AC_MSG_ERROR([Cannot find xcb-event])])
+PKG_CHECK_MODULES([xcb_atom], [xcb-atom],,
+ [AC_MSG_ERROR([Cannot find xcb-atom])])
LIBSN_CFLAGS="$X_CFLAGS $xcb_CFLAGS $xcb_aux_CFLAGS $xcb_event_CFLAGS $xcb_atom_CFLAGS"
LIBSN_LIBS=" $xcb_LIBS $xcb_aux_LIBS $xcb_event_LIBS $xcb_atom_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"