diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-10-28 00:00:36 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-10-28 00:00:36 +0000 |
| commit | e2befac122f1aca4beae9ac33fdb579cf673b6cd (patch) | |
| tree | 698fe2fc36aebf52d9ea7335448c7d4b1ebf2c53 /configure.ac | |
| parent | 1587fdd9af10ddb6df18982f453de2a297abbcf7 (diff) | |
split of libavahi-gobject, since people already starting complaining about the additional dependencies it pulls in for libavahi-glib: libgobject, libavahi-client, libdbus
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1563 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 97c64a5..7aca721 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [7:5:4]) AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:3:0]) AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:3:2]) AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0]) +AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:0:0]) AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0]) AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0]) AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:2:0]) @@ -418,13 +419,32 @@ AC_ARG_ENABLE(glib, [HAVE_GLIB=yes]) if test "x$HAVE_GLIB" = "xyes" ; then - PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 gobject-2.0 ]) + PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ]) AC_SUBST(GLIB20_CFLAGS) AC_SUBST(GLIB20_LIBS) fi AM_CONDITIONAL(HAVE_GLIB, test "x$HAVE_GLIB" = "xyes") # +# Check for GLIB's gobject 2.0 +# +AC_ARG_ENABLE(gobject, + AS_HELP_STRING([--disable-gobject],[Disable use of GLib GObject]), + [case "${enableval}" in + yes) HAVE_GOBJECT=yes ;; + no) HAVE_GOBJECT=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gobject) ;; + esac], + [HAVE_GOBJECT=yes]) + +if test "x$HAVE_GOBJECT" = "xyes" ; then + PKG_CHECK_MODULES(GOBJECT, [ glib-2.0 >= 2.4.0 gobject-2.0 ]) + AC_SUBST(GOBJECT_CFLAGS) + AC_SUBST(GOBJECT_LIBS) +fi +AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAVE_GOBJECT" = "xyes") + +# # Check for Qt 3 # AC_ARG_ENABLE(qt3, @@ -1029,6 +1049,7 @@ echo " C Compiler: ${CC} CFLAGS: ${CFLAGS} Enable GLIB: ${HAVE_GLIB} + Enable GLIB GObject: ${HAVE_GOBJECT} Enable GTK: ${HAVE_GTK} Enable D-Bus: ${HAVE_DBUS} Enable Expat: ${HAVE_EXPAT} @@ -1094,6 +1115,7 @@ echo "\ Building avahi-utils: ${BUILD_CLIENT} Building avahi-python: ${BUILD_PYTHON} Building libavahi-glib: ${HAVE_GLIB} + Building libavahi-gobject: ${HAVE_GOBJECT} Building avahi-discover-standalone: ${HAVE_GTK} Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4} |