build avahi-gobject only when avahi-client is also built

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index d5b0272062b20c354d9de4ce86a41c85422db0a8..6dd58d09731af661805e6b98dc29b054199eba31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,21 +21,21 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.21],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.22],[avahi (at) lists (dot) freedesktop (dot) org])
 AC_CONFIG_SRCDIR([avahi-core/server.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
 AC_SUBST(PACKAGE_URL, [http://avahi.org/])
 
-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_COMMON_VERSION_INFO, [8:0:5])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:4:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:4: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])
+AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:0:1])
 
 # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
 AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0])
@@ -1154,6 +1154,11 @@ if test "x$HAVE_GTK" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then
    BUILD_UI="yes"
 fi
 
+BUILD_GOBJECT="no"
+if test "x$BUILD_CLIENT" = "xyes" -a "x$HAVE_GOBJECT" = "xyes" ; then
+   BUILD_GOBJECT="yes"
+fi
+
 echo "\
     Building libavahi-core              yes
     Building avahi-daemon:              ${BUILD_DAEMON}
@@ -1162,7 +1167,7 @@ echo "\
     Building avahi-utils:               ${BUILD_CLIENT}
     Building avahi-python:              ${BUILD_PYTHON}
     Building libavahi-glib:             ${HAVE_GLIB}
-    Building libavahi-gobject:          ${HAVE_GOBJECT}
+    Building libavahi-gobject:          ${BUILD_GOBJECT}
     Building avahi-discover-standalone: ${HAVE_GTK}
     Building libavahi-qt3:              ${HAVE_QT3}
     Building libavahi-qt4:              ${HAVE_QT4}