diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-05-04 03:22:46 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-05-04 03:22:46 +0000 |
| commit | c0158234d046381a6bc8c004c82577576977d0d7 (patch) | |
| tree | dd0c727dc8447837d06338083e7da6994431b667 /configure.in | |
| parent | f60d798c5001070718407febeac42b63ddac314f (diff) | |
2003-05-03 Havoc Pennington <hp@pobox.com>
* dbus/dbus-watch.c (dbus_watch_handle): warn and return if a
watch is invalid when handled
* tools/Makefile.am, tools/dbus-launch.c, tools/dbus-launch.1: add
dbus-launch utility to launch the bus from a shell script. Didn't
actually implement dbus-launch yet, it's just a placeholder still.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/configure.in b/configure.in index b26a87e0..b36aeba9 100644 --- a/configure.in +++ b/configure.in @@ -438,6 +438,27 @@ dnl Qt flags AC_SUBST(DBUS_QT_CXXFLAGS) AC_SUBST(DBUS_QT_LIBS) +### X11 detection +AC_PATH_XTRA +DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" +DBUS_X_CFLAGS="$X_CFLAGS" +AC_SUBST(DBUS_X_CFLAGS) +AC_SUBST(DBUS_X_LIBS) + +## for now enable_x11 just tracks have_x11, +## there's no --enable-x11 +if test x$no_x = xyes ; then + have_x11=no + enable_x11=no +else + have_x11=yes + enable_x11=yes +fi + +if test x$enable_x11 = xyes ; then + AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code]) +fi + ### Documentation AC_PATH_PROG(DOXYGEN, doxygen, no) @@ -605,6 +626,11 @@ test/data/valid-service-files/debug-echo.service test/data/valid-service-files/debug-segfault.service ]) +### FIXME it's bizarre that have_qt and have_glib are used +### instead of enable_ - should fix things so that enable +### is always whether it's enabled, and have is always whether +### it was found. + dnl ========================================================================== echo " D-BUS $VERSION @@ -627,6 +653,7 @@ echo " Building checks: ${enable_checks} Building Qt bindings: ${have_qt} Building GLib bindings: ${have_glib} + Building X11 code: ${enable_x11} Building documentation: ${enable_docs} Using XML parser: ${with_xml} Init scripts style: ${with_init_scripts} |