* Add avahi-client to the doxygen run

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index e1524383a7296df5ef3c1882d4917baf484d296c..34b57896eb72b12e5f7ab5ecec8ec2820e36e213 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.1],[mzninuv (at) 0pointer (dot) de])
+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])
@@ -71,7 +71,7 @@ AC_SUBST(GLIB20_CFLAGS)
 AC_SUBST(GLIB20_LIBS)
 
 AC_ARG_ENABLE(gtk,
-        AS_HELP_STRING(--enable-gtk,use GTK+ (default=yes)),
+        AS_HELP_STRING(--disable-gtk,Use GTK+ (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_GTK=yes ;;
                 no)  ENABLE_GTK=no ;;
@@ -135,7 +135,7 @@ AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
 # D-BUS
 #
 AC_ARG_ENABLE(dbus,
-        AS_HELP_STRING(--enable-dbus,use DBus (default=yes)),
+        AS_HELP_STRING(--disable-dbus,Enable DBUS support (default=no)),
         [case "${enableval}" in
                 yes) ENABLE_DBUS=yes ;;
                 no)  ENABLE_DBUS=no ;;
@@ -253,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 ])
 
 # ==========================================================================