X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=0de1b3f6c88ac22b34e8208dd3fcd5a18b1b4af0;hb=b2abf404e9d5b8f156f359c6ab0ee444ba61322e;hp=3fbe8ae27c773a4e9af151ba77bb79dcfb7b03b8;hpb=f3164a7664414f7640b3f163bcaf9c2e87578bdb;p=catta

diff --git a/configure.ac b/configure.ac
index 3fbe8ae..0de1b3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,10 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.1],[mzninuv (at) 0pointer (dot) de])
-AC_CONFIG_SRCDIR([avahi-core])
+AC_INIT([avahi],[0.1],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_CONFIG_SRCDIR([avahi-core/server.c])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign -Wall])
+AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
 
@@ -71,7 +71,7 @@ AC_SUBST(GLIB20_CFLAGS)
 AC_SUBST(GLIB20_LIBS)
 
 AC_ARG_ENABLE(gtk,
-        AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
+        AS_HELP_STRING(--enable-gtk,use GTK+ (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_GTK=yes ;;
                 no)  ENABLE_GTK=no ;;
@@ -109,11 +109,33 @@ DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
 
+#
+# XMLTOMAN manpage generation
+#
+AC_ARG_ENABLE(xmltoman,
+        AS_HELP_STRING(--disable-xmltoman,Disable rebuilding of man pages with xmltoman),
+[case "${enableval}" in
+  yes) xmltoman=yes ;;
+  no)  xmltoman=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;;
+esac],[xmltoman=yes])
+
+if test x$xmltoman = xyes ; then
+   AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
+
+   if test x$have_xmltoman = xno ; then
+     AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
+     xmltoman=no
+   fi
+fi
+
+AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
+
 #
 # D-BUS
 #
 AC_ARG_ENABLE(dbus,
-        AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
+        AS_HELP_STRING(--enable-dbus,use DBus (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_DBUS=yes ;;
                 no)  ENABLE_DBUS=no ;;
@@ -169,7 +191,7 @@ fi
 #
 # Detecting the linux distro for specific things like initscripts.
 #
-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware]))
+AC_ARG_WITH(distro, AS_HELP_STRING(--with-distro=DISTRO,Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware))
 if test "z$with_distro" = "z"; then
    AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
    AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
@@ -231,7 +253,24 @@ AC_SUBST(avahi_socket)
 #
 # Python stuff
 #
-AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+AC_ARG_ENABLE(python,
+	AS_HELP_STRING(--disable-python, Disable scripts that depends on python),
+	[case "${enableval}" in
+	      yes) use_python=yes ;;
+	      no)  use_python=no ;;
+	      *) AC_MSG_ERROR([bad value ${enableval} for --disable-python]) ;;
+	esac],[use_python=yes])
+
+HAVE_PYTHON=no
+if test "x$use_python" = xyes ; then
+   AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+
+   if  test "x$HAVE_PYTHON" = xyes ; then
+       AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)])
+       AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(could not find python dbus module)])
+   fi
+fi
+
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])
 
 # ==========================================================================
@@ -253,6 +292,7 @@ avahi-utils/Makefile
 avahi-utils/avahi/Makefile
 examples/Makefile
 common/Makefile
+man/Makefile
 ])
 AC_OUTPUT