Drop private inotify code

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6dd58d09731af661805e6b98dc29b054199eba31..8c41f6bc62414accb00c48996946071b5757c9ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.22],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.23],[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])
@@ -29,12 +29,12 @@ AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 AC_SUBST(PACKAGE_URL, [http://avahi.org/])
 
 AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:0:5])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:4:0])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:5: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_GOBJECT_VERSION_INFO, [0:1: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:0:1])
 
 # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
@@ -246,13 +246,17 @@ AC_TRY_COMPILE([#include <netinet/in.h>], [
 #
 AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of debian, gentoo, archlinux, fedora, mandriva, darwin, netbsd, freebsd, slackware or none]))
 if test "z$with_distro" = "z"; then
-    AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-    AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
-    AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
-    AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
-    AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
-    AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
-    AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
+    if test "$cross_compiling" = yes; then
+        AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
+    else
+        AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
+        AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
+        AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
+        AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
+        AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
+        AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
+        AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
+    fi
     if test "z$with_distro" = "z"; then
         with_distro=`uname -s`
     fi
@@ -349,8 +353,10 @@ AC_HEADER_SYS_WAIT
 # Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
+# avahi_malloc actually returns NULL for avahi_malloc(0), so it does not matter
+# whether libc's malloc does too. (Same for realloc.)
+#AC_FUNC_MALLOC
+#AC_FUNC_REALLOC
 AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid setresgid setregid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname seteuid setegid setproctitle getprogname])
 
 AC_FUNC_CHOWN
@@ -360,6 +366,9 @@ AC_TYPE_PID_T
 
 AC_CHECK_DECLS(environ)
 
+# check if gcc's -fvisibility is supported
+CHECK_VISIBILITY_HIDDEN
+
 enable_chroot=yes
 AC_CHECK_HEADERS([sys/capability.h],,enable_chroot=no)
 AC_CHECK_HEADERS([sys/prctl.h],,enable_chroot=no)
@@ -378,7 +387,6 @@ 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")
@@ -473,10 +481,10 @@ if test "x$HAVE_QT3" = "xyes" ; then
         AC_SUBST(QT3_CFLAGS)
         AC_SUBST(QT3_LIBS)
            QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
-        MOC_QT3="no"
-           AC_CHECK_FILE( "$QT3_PREFIX/moc-qt3", [ MOC_QT3=$QT3_PREFIX/moc-qt3 ], [
-                   AC_CHECK_FILE("$QT3_PREFIX/moc", [ MOC_QT3=$QT3_PREFIX/moc ], [
-                AC_MSG_ERROR([Couldn't find QT3 moc])])])
+        AC_PATH_PROGS(MOC_QT3, [moc-qt3 moc], no, [$QT3_PREFIX])
+        if test "$MOC_QT3" = no; then
+            AC_MSG_ERROR([Could not find QT3 moc])
+        fi
         AC_SUBST(MOC_QT3)
 fi
 AM_CONDITIONAL(HAVE_QT3, test "x$HAVE_QT3" = "xyes")
@@ -498,10 +506,10 @@ if test "x$HAVE_QT4" = "xyes" ; then
         AC_SUBST(QT4_CFLAGS)
         AC_SUBST(QT4_LIBS)
            QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
-        MOC_QT4="no"
-           AC_CHECK_FILE( "$QT4_PREFIX/moc-qt4", [ MOC_QT4=$QT4_PREFIX/moc-qt4 ], [
-               AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc ], [
-               AC_MSG_ERROR([Couldn't find QT4 moc])])])
+        AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX])
+        if test "$MOC_QT4" = no; then
+            AC_MSG_ERROR([Could not find QT4 moc])
+        fi
         AC_SUBST(MOC_QT4)
 fi
 AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes")