python: use module gdbm exclusively (dropping anydbm, dbm)

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8732a8f740664cc9e154a58da6fc20817ecce4e5..c9de6ae8bd5cbd1767183d35661f791b654f09ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,13 +21,20 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.2],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.4],[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])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
 
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [1:0:1])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [0:1:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:0:0])
+AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0])
+AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0])
+
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
     AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
     ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
@@ -265,7 +272,7 @@ AC_ARG_WITH(dbus-system-socket, AS_HELP_STRING([--with-dbus-system-address=<addr
 if test "x$HAVE_DBUS" = "xyes" ; then
     AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-BUS or not])
 
-    PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.30 ])
+    PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ])
     DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
     AC_SUBST(DBUS_CFLAGS)
     AC_SUBST(DBUS_LIBS)
@@ -340,6 +347,9 @@ AC_ARG_ENABLE(python,
           *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;;
     esac],[HAVE_PYTHON=yes])
 
+HAVE_PYTHON_DBUS=no
+HAVE_PYGTK=no
+
 if test "x$HAVE_PYTHON" = "xyes" ; then
     AM_PATH_PYTHON([2.4])
 
@@ -352,11 +362,10 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
         esac],
         [HAVE_PYGTK=yes])
     
-    if "x$HAVE_PYGTK" = "xyes" ; then
+    if test "x$HAVE_PYGTK" = "xyes" ; then
         AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
     fi
 
-    AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes")
 
     AC_ARG_ENABLE(python-dbus,
         AS_HELP_STRING([--disable-python-dbus],[Disable use of D-BUS in Python]),
@@ -367,17 +376,16 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
         esac],
         [HAVE_PYTHON_DBUS=yes])
     
-    if "x$HAVE_PYTHON_DBUS" = "xyes"; then
+    if test "x$HAVE_PYTHON_DBUS" = "xyes"; then
         AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
     fi
 
-    AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes")
-
     AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
-    AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
-    AM_CHECK_PYMOD(anydbm,,,[AC_MSG_ERROR(Could not find Python module anydbm)])
+    AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
 fi
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ])
+AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes")
+AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes")
 
 #
 # Defining Avahi User and Group.
@@ -491,6 +499,8 @@ echo "
     Enable Expat:           ${HAVE_EXPAT}
     Enable libdaemon:       ${HAVE_LIBDAEMON}
     Enable Python:          ${HAVE_PYTHON}
+    Enable pygtk:           ${HAVE_PYGTK}
+    Enable python-dbus:     ${HAVE_PYTHON_DBUS}
     Enable QT3:             ${HAVE_QT3}
     Enable QT4:             ${HAVE_QT4}
     Linux Distro:           ${with_distro}
@@ -506,7 +516,7 @@ fi
 
 BUILD_UTILS="no (!)"
 
-if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" -a "x$HAVE_PYTHON_DBUS" = "xyes" -a "x$HAVE_PYTHON_GTK"; then
+if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" -a "x$HAVE_PYTHON_DBUS" = "xyes" -a "x$HAVE_PYGTK" = "xyes" ; then
     BUILD_UTILS=yes
 fi