X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=4d6b2884de9bf4a7d3f1f573118839aa4ecfd12c;hb=fe8f5ec6f8e86c6eea88dd196fbcb60deeef0795;hp=42d7d229e47e4a63dc13acaa6cc1072d85ce6439;hpb=ed11c6a4d4da379ff9ebccb7a0340e64232efabb;p=catta

diff --git a/configure.ac b/configure.ac
index 42d7d22..4d6b288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,21 +19,22 @@
 # USA.
 
 AC_PREREQ(2.63)
-AC_INIT([avahi],[0.6.25],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.26],[avahi (at) lists (dot) freedesktop (dot) org])
 AC_CONFIG_SRCDIR([avahi-core/server.c])
+AC_CONFIG_MACRO_DIR([common])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
 
 AC_SUBST(PACKAGE_URL, [http://avahi.org/])
 
-AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:1:5])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [6:1:0])
-AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:5:2])
-AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0])
-AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:1:0])
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:2:5])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [7:0:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:6:2])
+AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:2:0])
+AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:2:0])
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0])
-AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:1:1])
+AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:2: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])
@@ -468,6 +469,11 @@ if test "x$HAVE_GOBJECT" = "xyes" ; then
 fi
 AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAVE_GOBJECT" = "xyes")
 
+#
+# Introspection support.
+#
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
 #
 # Check for Qt 3
 #
@@ -558,7 +564,7 @@ if test "x$HAVE_GTK3" = "xyes" ; then
 fi
 AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
 
-AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK2" = "xyes" )
+AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" )
 
 #
 # D-Bus
@@ -1136,6 +1142,7 @@ echo "
     CFLAGS:                                    ${CFLAGS}
     Enable GLIB:                               ${HAVE_GLIB}
     Enable GLIB GObject:                       ${HAVE_GOBJECT}
+    Enable GObject Introspection:              ${found_introspection}
     Enable GTK 2.0:                            ${HAVE_GTK}
     Enable GTK 3.0:                            ${HAVE_GTK3}
     Enable D-Bus:                              ${HAVE_DBUS}