* Use a recursive mutex for locking DNSServiceRef

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41f41c2e608c799387d303d8a508a7da02372315..50f46bc3b4f5601273ec6eb782aec9c04c587824 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.5],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6],[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])
@@ -34,6 +34,7 @@ AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [2:0:1])
 AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0])
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBAVAHI_COMPAT_BONJOUR_VERSION_INFO, [1:0:0])
 
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
     AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
@@ -53,6 +54,8 @@ AC_PROG_GCC_TRADITIONAL
 # libtool stuff
 AC_PROG_LIBTOOL
 
+ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support]))
+
 #
 # Detecting the linux distribution for specific things like init scripts.
 #
@@ -286,9 +289,19 @@ if test "x$HAVE_DBUS" = "xyes" ; then
     if ! test -z "$with_dbus_system_address" ; then
         DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="$with_dbus_system_address"
     else
-        # Note this default path is hardcoded in D-BUS and should
-        # not use $localstatedir
+        # This is ugly, but D-BUS doesn't export this address for us
+        # so we have to guess, pretty much all setups i've seen have 
+        # it in /var/lib/dbus or /var/run/dbus, and its defaulted to
+        # /var/run upstream so we will try guess first then default
+        # to /var/run/dbus
+
         DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=/var/run/dbus/system_bus_socket"
+        TRY_SOCKETS="/var/lib/dbus/system_bus_socket /var/run/dbus/system_bus_socket"
+        for sock in $TRY_SOCKETS; do
+            if test -S $sock; then
+                DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$sock"
+            fi
+        done
     fi
     AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)
     
@@ -398,12 +411,12 @@ AC_ARG_ENABLE(mono,
         esac],
         [HAVE_MONO=yes])
 
-AC_ARG_ENABLE(mono-docs,
-        AS_HELP_STRING([--disable-mono-docs],[Disable documentation for mono bindings]),
+AC_ARG_ENABLE(monodoc,
+        AS_HELP_STRING([--disable-monodoc],[Disable documentation for mono bindings]),
         [case "${enableval}" in
                 yes) HAVE_MONODOC=yes ;;
                 no)  HAVE_MONODOC=no ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --enable-mono-docs) ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-monodoc) ;;
         esac],
         [HAVE_MONODOC=yes])
 
@@ -542,6 +555,7 @@ man/Makefile
 tests/Makefile
 service-type-database/Makefile
 avahi-sharp/Makefile
+compat-bonjour/Makefile
 ])
 AC_OUTPUT