* don't use autoconf to replace paths in avahi-utils. Use sed instead

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index e64fcdeacace80e333c96ce4d0b6c04e1611af8a..95fc1aaf9a781515232ae8f012d6d7d798fc3096 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -96,17 +96,22 @@ 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")
+#
+# 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(OFF)
+DX_PS_FEATURE(OFF)
+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
@@ -136,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)
@@ -217,26 +228,71 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
 AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
+#
+# Python stuff
+#
+AC_SUBST(PYGTK_REQ, 2.6.0)
+
+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 
 avahi-core.pc 
-doxygen/Makefile 
-doxygen/doxygen.conf 
 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
 initscript/Gentoo/Makefile
 initscript/SUSE/Makefile
 avahi-dnsconfd/Makefile
+avahi-utils/Makefile
+avahi-utils/avahi/Makefile
+examples/Makefile
+common/Makefile
 ])
 AC_OUTPUT
 
-dnl ==========================================================================
+# ==========================================================================
 echo "
  ---{ $PACKAGE_NAME $VERSION }---
 
@@ -246,6 +302,9 @@ echo "
     dbus-1 version:         `pkg-config dbus-1 --modversion`
     compiler:               ${CC}
     cflags:                 ${CFLAGS}
+    Enable Gtk:             ${ENABLE_GTK}
+    Enable DBUS:            ${ENABLE_DBUS}
+    Have Python:            ${HAVE_PYTHON}
     Linux Distro:           ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}