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 a61d0f2da50d4d4357f1d59544b93877347a5f71..d047e5c2286e330dbe63999fa9a14f7c34f36b1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,16 +21,16 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.4],[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])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
 
-AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [1:0:1])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [0:2:0])
-AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:0:0])
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [2:0:2])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [2:0:1])
+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])
@@ -251,6 +251,8 @@ if test "x$HAVE_GTK" = "xyes" ; then
 fi
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
+
+
 #
 # D-BUS
 #
@@ -284,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)
     
@@ -384,6 +396,59 @@ AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ])
 AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes")
 AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes")
 
+#
+# Check for mono stuff
+#
+AC_ARG_ENABLE(mono,
+        AS_HELP_STRING([--disable-mono],[Disable mono bindings]),
+        [case "${enableval}" in
+                yes) HAVE_MONO=yes ;;
+                no)  HAVE_MONO=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-mono) ;;
+        esac],
+        [HAVE_MONO=yes])
+
+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-monodoc) ;;
+        esac],
+        [HAVE_MONODOC=yes])
+
+if test "x$HAVE_MONO" = "xyes" ; then
+        AC_PATH_PROG(MCS, mcs)
+        if test "x$MCS" = "x" ; then
+               AC_MSG_ERROR([Can not find "mcs" in your PATH])
+        fi
+
+        AC_PATH_PROG(GACUTIL, gacutil)
+        if test "x$GACUTIL" = "x" ; then
+                AC_MSG_ERROR([Can not find "gacutil" in your PATH])
+        fi
+
+        AC_SUBST(MCS)
+        AC_SUBST(GACUTIL)
+fi
+AM_CONDITIONAL(HAVE_MONO, test "x$HAVE_MONO" = "xyes")
+
+#
+# Check for monodoc stuff
+#
+if test "x$HAVE_MONODOC" = "xyes" ; then
+        PKG_CHECK_MODULES(MONODOC, [monodoc >= 1.1.8])
+        MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc`        
+
+        AC_PATH_PROG(MONODOCER, monodocer)
+        AC_PATH_PROG(MDASSEMBLER, mdassembler)
+
+        AC_SUBST(MONODOC_DIR)
+        AC_SUBST(MONODOCER)
+        AC_SUBST(MDASSEMBLER)
+fi
+AM_CONDITIONAL(HAVE_MONODOC, test "x$HAVE_MONODOC" = "xyes")
+
 #
 # Defining Avahi User and Group.
 #
@@ -414,6 +479,15 @@ AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
 
+#
+# Avahi interfaces dir
+#
+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
+       interfacesdir="${datadir}/${PACKAGE}/interfaces/"
+       AC_SUBST(interfacesdir)
+fi
+
+
 #
 # Doxygen
 #
@@ -477,6 +551,7 @@ common/Makefile
 man/Makefile
 tests/Makefile
 service-type-database/Makefile
+avahi-sharp/Makefile
 ])
 AC_OUTPUT
 
@@ -486,6 +561,8 @@ echo "
 
     prefix:                 ${prefix}
     sysconfdir:             ${sysconfdir}
+    localstatedir:          ${localstatedir}
+    avahi socket:           ${avahi_socket}
     dbus-1 system.d dir:    ${DBUS_SYS_DIR}
     dbus-1 version:         `pkg-config dbus-1 --modversion`
     dbus-1 system socket    ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS}
@@ -501,6 +578,7 @@ echo "
     Enable python-dbus:     ${HAVE_PYTHON_DBUS}
     Enable QT3:             ${HAVE_QT3}
     Enable QT4:             ${HAVE_QT4}
+    Enable Mono:            ${HAVE_MONO}
     Linux Distro:           ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}
@@ -534,4 +612,5 @@ echo "
     Building avahi-discover-standalone: ${HAVE_GTK}
     Building libavahi-qt3:              ${HAVE_QT3}
     Building libavahi-qt4:              ${HAVE_QT4}
+    Building avahi-sharp:               ${HAVE_MONO}
 "