X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=3fbe8ae27c773a4e9af151ba77bb79dcfb7b03b8;hb=d76069e946b4e89c828c96340677e40f583080c9;hp=29182efa95521568cf2d0b43f4a9c08195cc095f;hpb=1a912326734243e57a461c48131c1a0402318b5a;p=catta

diff --git a/configure.ac b/configure.ac
index 29182ef..3fbe8ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,16 +96,22 @@ if test "x$ENABLE_GTK" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
 
+#
+# Doxygen
+#
 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_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
-DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen-doc)
+DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
 
+#
+# D-BUS
+#
 AC_ARG_ENABLE(dbus,
         AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
         [case "${enableval}" in
@@ -135,12 +141,18 @@ fi
 
 AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" = "xyes")
 
+#
+# Expat
+#
 AC_CHECK_LIB(expat, XML_ParserCreate, [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], have_expat=false)
 
 if ! $have_expat ; then
    AC_MSG_ERROR([*** libexpat not found ***])
 fi
 
+#
+# LibDaemon
+#
 PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.5 ])
 AC_SUBST(LIBDAEMON_CFLAGS)
 AC_SUBST(LIBDAEMON_LIBS)
@@ -216,8 +228,13 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
 AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
-AM_PATH_PYTHON(2.2)
+#
+# Python stuff
+#
+AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])
 
+# ==========================================================================
 AC_CONFIG_FILES([
 Makefile 
 avahi-core.pc 
@@ -225,7 +242,7 @@ avahi-common/Makefile
 avahi-core/Makefile 
 avahi-daemon/Makefile 
 avahi-daemon/avahi-dbus.conf
-avahi-discover/Makefile 
+avahi-discover-standalone/Makefile 
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/Debian/Makefile
@@ -234,14 +251,12 @@ 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
+examples/Makefile
+common/Makefile
 ])
 AC_OUTPUT
 
-dnl ==========================================================================
+# ==========================================================================
 echo "
  ---{ $PACKAGE_NAME $VERSION }---
 
@@ -252,7 +267,8 @@ echo "
     compiler:               ${CC}
     cflags:                 ${CFLAGS}
     Enable Gtk:             ${ENABLE_GTK}
-    Enable Dbus:            ${ENABLE_DBUS}
+    Enable DBUS:            ${ENABLE_DBUS}
+    Have Python:            ${HAVE_PYTHON}
     Linux Distro:           ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}