fix some small bugs in publishing and resolving, and make uninstall work

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2986334eec5ad605c0a4445337020f492bffba80..7953dda81741c3eb3c1cb9366bde279aa4cf47dc 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.5],[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, [1:1:1])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [1:0:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:1:0])
 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])
@@ -386,6 +386,34 @@ 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])
+
+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")
+
 #
 # Defining Avahi User and Group.
 #
@@ -498,6 +526,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}
@@ -513,6 +543,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}
@@ -546,4 +577,5 @@ echo "
     Building avahi-discover-standalone: ${HAVE_GTK}
     Building libavahi-qt3:              ${HAVE_QT3}
     Building libavahi-qt4:              ${HAVE_QT4}
+    Building avahi-sharp:               ${HAVE_MONO}
 "