Move SimpleGladeApp.py into avahi-discover, so that avahi-python doesn't need to...

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2286b8090bbdf102229f9d712e099fd037bfd6b2..7126678954076277f34a8e276b93681367e20191 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,20 +21,20 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.18],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.21],[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:4:4])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:1:0])
-AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:2:2])
+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_QT3_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0])
-AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:2:0])
 
 # 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])
@@ -84,7 +84,7 @@ if test x"$enable_ssp" = x"yes"; then
     AC_MSG_CHECKING([whether stack-smashing protection is available])
     ssp_old_cflags="$CFLAGS"
     ssp_old_ldflags="$LDFLAGS"
-    CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
+    CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
     LDFLAGS="$LDFLAGS -Wl,-z,defs"
     cat confdefs.h > conftest.c
     cat >>conftest.c <<_ACEOF
@@ -338,6 +338,11 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 
+ # Solaris stuff 
+ AC_SEARCH_LIBS([inet_ntop],[nsl]) 
+ AC_SEARCH_LIBS([recv],[socket]) 
+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__") 
+
 # Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
@@ -379,6 +384,15 @@ if test "x$have_inotify" = "xyes" ; then
    AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage])
 fi
 
+have_kqueue=yes
+AC_CHECK_FUNCS([kqueue],,have_kqueue=no)
+
+AM_CONDITIONAL(HAVE_KQUEUE, test "x$have_kqueue" = "xyes")
+
+if test "x$have_kqueue" = "xyes" ; then
+    AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() 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)
@@ -654,7 +668,7 @@ AC_ARG_ENABLE(libdaemon,
         [HAVE_LIBDAEMON=yes]) 
 
 if test "x$HAVE_LIBDAEMON" = "xyes" ; then
-    PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.5 ])
+    PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.11 ])
     AC_SUBST(LIBDAEMON_CFLAGS)
     AC_SUBST(LIBDAEMON_LIBS)
 fi
@@ -983,6 +997,7 @@ avahi-dnsconfd/Makefile
 avahi-utils/Makefile
 avahi-python/Makefile
 avahi-python/avahi/Makefile
+avahi-python/avahi-discover/Makefile
 examples/Makefile
 common/Makefile
 man/Makefile