From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 30 Aug 2005 18:18:51 +0000 (+0000)
Subject: Fix even more breakage from r504
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=cbe416351c4c1a99df476d3cee4a20af64fb3b89;p=catta

Fix even more breakage from r504


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@509 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---

diff --git a/configure.ac b/configure.ac
index cbdf26c..45a62c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,6 +340,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])
 
@@ -356,7 +359,6 @@ if test "x$HAVE_PYTHON" = "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]),
@@ -371,13 +373,13 @@ if test "x$HAVE_PYTHON" = "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)])
 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.