* add avahi-utils in autoconf

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index e64fcdeacace80e333c96ce4d0b6c04e1611af8a..29182efa95521568cf2d0b43f4a9c08195cc095f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -96,16 +96,15 @@ if test "x$ENABLE_GTK" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
 
-AC_ARG_ENABLE(doxygen,
-        AC_HELP_STRING([--enable-doxygen],[use doxygen to generate API docs (default=yes)]),
-        [case "${enableval}" in
-                yes) ENABLE_DOXYGEN=yes ;;
-                no)  ENABLE_DOXYGEN=no ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;;
-        esac],
-        [ENABLE_DOXYGEN=yes]) dnl Default value
-
-AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes")
+DX_HTML_FEATURE(ON)
+DX_CHM_FEATURE(OFF)
+DX_CHI_FEATURE(OFF)
+DX_MAN_FEATURE(OFF)
+DX_RTF_FEATURE(OFF)
+DX_XML_FEATURE(OFF)
+DX_PDF_FEATURE(ON)
+DX_PS_FEATURE(OFF)
+DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen-doc)
 
 AC_ARG_ENABLE(dbus,
         AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
@@ -217,11 +216,11 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
 AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
+AM_PATH_PYTHON(2.2)
+
 AC_CONFIG_FILES([
 Makefile 
 avahi-core.pc 
-doxygen/Makefile 
-doxygen/doxygen.conf 
 avahi-common/Makefile 
 avahi-core/Makefile 
 avahi-daemon/Makefile 
@@ -233,6 +232,12 @@ initscript/Debian/Makefile
 initscript/Gentoo/Makefile
 initscript/SUSE/Makefile
 avahi-dnsconfd/Makefile
+avahi-utils/Makefile
+avahi-utils/avahi/Makefile
+avahi-utils/avahi-dump-all
+avahi-utils/avahi-publish-service
+avahi-utils/avahi-publish-address
+avahi-utils/avahi-discover
 ])
 AC_OUTPUT
 
@@ -246,6 +251,8 @@ echo "
     dbus-1 version:         `pkg-config dbus-1 --modversion`
     compiler:               ${CC}
     cflags:                 ${CFLAGS}
+    Enable Gtk:             ${ENABLE_GTK}
+    Enable Dbus:            ${ENABLE_DBUS}
     Linux Distro:           ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}