* added a .desktop for avahi-discover

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 95fc1aaf9a781515232ae8f012d6d7d798fc3096..b9ebef32c4ca59994880c378d0ad4b7f23b677d9 100644 (file)
--- 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,45 +253,26 @@ AC_SUBST(avahi_socket)
 #
 # Python stuff
 #
-AC_SUBST(PYGTK_REQ, 2.6.0)
+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_PATH_PYTHON(2.4)
-AM_PYTHON_CHECK_VERSION("$PYTHON", 2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])
 
-# check for pygtk
-dnl PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ)
-dnl PYGTK_DIR="`$PKG_CONFIG --variable=pyexecdir pygtk-2.0`"
-dnl AC_SUBST(PYGTK_DIR)
-dnl AC_MSG_NOTICE(Using pygtk installed in $PYGTK_DIR)
-dnl PYGTK_VERSION="`$PKG_CONFIG --modversion pygtk-2.0`"
-dnl if test "x$PYGTK_VERSION" = "x2.5.2"
-dnl then
-dnl  AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version])
-dnl fi
-dnl export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH
-
-dnl check for gtk.glade
-dnl AC_MSG_CHECKING(for gtk.glade)
-dnl prog="
-dnl import sys
-dnl try:
-dnl  import gtk.glade
-dnl except RuntimeError:
-dnl   sys.exit(0)
-dnl except ImportError:
-dnl   sys.exit(1)
-dnl sys.exit(0)
-dnl "
-
-dnl if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-dnl then
-dnl   AC_MSG_RESULT(found)
-dnl else
-dnl   AC_MSG_RESULT(not found)
-dnl   AC_MSG_ERROR([You need to have python libglade bindings installed])
-dnl fi
-
 # ==========================================================================
 AC_CONFIG_FILES([
 Makefile 
@@ -289,6 +292,7 @@ avahi-utils/Makefile
 avahi-utils/avahi/Makefile
 examples/Makefile
 common/Makefile
+man/Makefile
 ])
 AC_OUTPUT