X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=d9d4f421361b1b4a135b8c7e6494d7290c30814c;hb=a4ebf2e6c969b1ff4af0cab6be19856bf241c0c5;hp=0939d1df6d258ee282017ed5924bb3ed775be41e;hpb=1d3ac6de89d607530ae28ab4c97c03a5762b8f22;p=catta

diff --git a/configure.ac b/configure.ac
index 0939d1d..d9d4f42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.17],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.18],[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:3:4])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:0:0])
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [7:4:4])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:1:0])
 AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:2:2])
 AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0])
@@ -296,6 +296,16 @@ if test "x$HAVE_DLOPEN" = "xyes" ; then
 fi
 AM_CONDITIONAL(HAVE_DLOPEN, test "x$HAVE_DLOPEN" = "xyes")
 
+have_inotify=no
+AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes])
+AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes])
+
+AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes")
+
+if test "x$have_inotify" = "xyes" ; then
+   AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage])
+fi
+
 # Check for pkg-config manually first, as if its not installed the
 # PKG_PROG_PKG_CONFIG macro won't be defined.
 AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
@@ -736,7 +746,7 @@ fi
 AC_SUBST(AVAHI_PRIV_ACCESS_GROUP)
 AC_DEFINE_UNQUOTED(AVAHI_PRIV_ACCESS_GROUP,"$AVAHI_PRIV_ACCESS_GROUP", [Privileged access group for Avahi clients])
 
-AC_ARG_WITH(autoipd_user, AS_HELP_STRING([--with-autipd-user=<user>],[User for running the avahi-autoipd daemon (avahi-autoipd)]))
+AC_ARG_WITH(autoipd_user, AS_HELP_STRING([--with-autoipd-user=<user>],[User for running the avahi-autoipd daemon (avahi-autoipd)]))
 if test -z "$with_autoipd_user" ; then
     AVAHI_AUTOIPD_USER=avahi-autoipd
 else
@@ -948,6 +958,7 @@ echo "
     User for avahi-autoipd:                    ${AVAHI_AUTOIPD_USER}
     Group for avahi-autoipd:                   ${AVAHI_AUTOIPD_GROUP}
     Enable chroot():                           ${enable_chroot}
+    Enable Linux inotify:                      ${have_inotify}
 "
 
 BUILD_DAEMON="no   (You need libdaemon and expat!)"