diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2002-12-16 00:26:05 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2002-12-16 00:26:05 +0000 |
| commit | c531a709f3b0f05c0a95aa932045d6e2209ae7b9 (patch) | |
| tree | 22e198a761c88fb8ed13a382e943fb25b3bcb38c /configure.in | |
| parent | 3327ecfdcf6d3cd36b8b739282e9c0d2b768567a (diff) | |
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 4440040d..9806da9e 100644 --- a/configure.in +++ b/configure.in @@ -21,8 +21,8 @@ AC_ISC_POSIX AC_HEADER_STDC AM_PROG_LIBTOOL -AC_ARG_ENABLE(qt, [ --disable-qt disable Qt-friendly client library],enable_qt=no,enable_qt=yes) -AC_ARG_ENABLE(glib, [ --disable-glib disable GLib-friendly client library],enable_glib=no,enable_glib=yes) +AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=no) +AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto) AC_ARG_ENABLE(tests, [ --enable-tests enable unit test code],enable_tests=yes,enable_tests=no) AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic gcc flags],enable_ansi=yes,enable_ansi=no) @@ -121,14 +121,39 @@ DBUS_TEST_LIBS= AC_SUBST(DBUS_TEST_CFLAGS) AC_SUBST(DBUS_TEST_LIBS) +# Glib detection +PKG_CHECK_MODULES(DBUS_GLIB, glib-2.0, have_glib=yes, have_glib=no) + +if test x$have_glib = xno ; then + AC_MSG_WARN([GLib development libraries not found]) +fi + +if test x$enable_glib = xyes; then + if test x$have_glib = xno; then + AC_MSG_ERROR([GLib explicitly required, and GLib development libraries not found]) + fi +fi + +if test x$enable_glib = xno; then + have_glib=no; +fi + +AM_CONDITIONAL(HAVE_GLIB, test x$have_glib = xyes) + +dnl GLib flags +AC_SUBST(DBUS_GLIB_CFLAGS) +AC_SUBST(DBUS_GLIB_LIBS) + AC_OUTPUT([ Makefile Doxyfile dbus/Makefile +glib/Makefile bus/Makefile test/Makefile doc/Makefile dbus-1.0.pc +dbus-glib-1.0.pc ]) dnl ========================================================================== @@ -142,7 +167,7 @@ echo " Building unit tests: ${enable_tests} Building Qt bindings: ${enable_qt} - Building GLib bindings: ${enable_glib} + Building GLib bindings: ${have_glib} " if test x$enable_tests = xyes; then @@ -151,7 +176,4 @@ fi if test x$enable_qt = xyes; then echo "NOTE: Qt bindings don't actually exist yet" fi -if test x$enable_glib = xyes; then - echo "NOTE: GLib bindings don't actually exist yet" -fi |