X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=b9aa356220e9ddc2cb708447fc51733e12408259;hb=0458aec3b31f7a5c73bab74f131914249c8dd6f6;hp=2366a009de57d8f0f38b3905d5bc42557c5a8a57;hpb=767bac373b93988410269f170a1dcbd45bc97777;p=catta

diff --git a/configure.ac b/configure.ac
index 2366a00..b9aa356 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.29],[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:1:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:8:2])
+AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:2:0])
+AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:4: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:4: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])
@@ -173,6 +174,7 @@ AC_DEFINE([HAVE_PF_ROUTE],[],[Support for PF_ROUTE])
 , [], [
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <net/if_dl.h>
 ])
 
 AM_CONDITIONAL(HAVE_PF_ROUTE, [ test x"$HAVE_PF_ROUTE" = xyes ])
@@ -305,7 +307,7 @@ test_gcc_flag() {
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
 
-    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -fdiagnostics-show-option -Wno-cast-qual"
+    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -fdiagnostics-show-option -Wno-cast-qual -fno-strict-aliasing"
 
     if test "x$HAVE_NETLINK" = "xyes" ; then
         # Test whether rtnetlink.h can be included when compiled with -std=c99
@@ -467,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.9.5])
+
 #
 # Check for Qt 3
 #
@@ -557,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
@@ -763,7 +770,7 @@ AC_ARG_ENABLE(libdaemon,
         [HAVE_LIBDAEMON=yes])
 
 if test "x$HAVE_LIBDAEMON" = "xyes" ; then
-    PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.11 ])
+    PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.14 ])
     AC_SUBST(LIBDAEMON_CFLAGS)
     AC_SUBST(LIBDAEMON_LIBS)
 fi
@@ -1066,6 +1073,17 @@ AC_ARG_ENABLE(compat-howl,
 
 AM_CONDITIONAL([ENABLE_COMPAT_HOWL], [test "x$ENABLE_COMPAT_HOWL" = "xyes"])
 
+#
+# systemd
+#
+AC_ARG_WITH([systemdsystemunitdir],
+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+        [],
+        [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+        AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
 
 # ==========================================================================
 AC_CONFIG_FILES([
@@ -1126,6 +1144,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}
@@ -1149,6 +1168,7 @@ echo "
     Enable chroot():                           ${enable_chroot}
     Enable Linux inotify:                      ${have_inotify}
     Enable stack-smashing protection:          ${enable_ssp}
+    systemd unit directory:                    ${with_systemdsystemunitdir}
 "
 
 BUILD_DAEMON="no   (You need libdaemon and expat/bsdxml!)"