X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=d8546d8c53c5711be88511d30eb7c7fff9ff324e;hb=dab307a583fcacdb0703e451f4f854f540fc8ec1;hp=908f709f5c15cea78b9da5adb720d9bf872ca1eb;hpb=adfa1d85bce393fa549b72fa1dd650eb3c74f8d8;p=catta

diff --git a/configure.ac b/configure.ac
index 908f709..d8546d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,6 +408,15 @@ AC_ARG_ENABLE(mono,
         esac],
         [HAVE_MONO=yes])
 
+AC_ARG_ENABLE(mono-docs,
+        AS_HELP_STRING([--disable-mono-docs],[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) ;;
+        esac],
+        [HAVE_MONODOC=yes])
+
 if test "x$HAVE_MONO" = "xyes" ; then
         AC_PATH_PROG(MCS, mcs)
         if test "x$MCS" = "x" ; then
@@ -406,7 +425,7 @@ if test "x$HAVE_MONO" = "xyes" ; then
 
         AC_PATH_PROG(GACUTIL, gacutil)
         if test "x$GACUTIL" = "x" ; then
-               AC_MSG_ERROR([Can not find "gacutil" in your PATH])
+                AC_MSG_ERROR([Can not find "gacutil" in your PATH])
         fi
 
         AC_SUBST(MCS)
@@ -414,6 +433,22 @@ if test "x$HAVE_MONO" = "xyes" ; then
 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.
 #