Adapt to undocumented hack (passing 0:0 in tv to mean "now") that probably got introd...

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41f41c2e608c799387d303d8a508a7da02372315..d047e5c2286e330dbe63999fa9a14f7c34f36b1b 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])
@@ -286,9 +286,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 +408,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])