* added a .desktop for avahi-discover

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5da0054ed1deb2822f56ebe7ae3472e7824ea39e..b9ebef32c4ca59994880c378d0ad4b7f23b677d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,8 @@
 # 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 1.9 -Wall])
 
@@ -109,6 +109,28 @@ 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
 #
@@ -231,7 +253,24 @@ AC_SUBST(avahi_socket)
 #
 # Python stuff
 #
-AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+dnl AC_ARG_ENABLE(python,
+dnl        AS_HELP_STRING(--disable-python, Disable scripts that depends on python),
+dnl [case "${enableval}" in
+dnl   yes) use_python=yes ;;
+dnl   no)  use_python=no ;;
+dnl   *) AC_MSG_ERROR([bad value ${enableval} for --disable-python]) ;;
+dnl esac],[use_python=yes])
+
+dnl HAVE_PYTHON=no
+dnl 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
+dnl fi
+
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])
 
 # ==========================================================================