X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=41f41c2e608c799387d303d8a508a7da02372315;hb=5af9f469d85a9281bc5484e9f5a8740751591dfe;hp=cb55146eec3267eae91ce77702b19658a521d03a;hpb=e8e2707e96c08eda0ec6df2510dae4e6c71111ed;p=catta

diff --git a/configure.ac b/configure.ac
index cb55146..41f41c2 100644
--- 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, [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])
@@ -398,6 +398,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 +415,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 +423,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.
 #
@@ -526,6 +551,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}