* Don't require python for build

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

diff --git a/avahi-utils/avahi/Makefile.am b/avahi-utils/avahi/Makefile.am
index cbabcc5749a51d90e12814d9717423664853fbb7..248bf692d9f7f57f17c71e27a3ebece9e3fc6aee 100644 (file)
--- a/avahi-utils/avahi/Makefile.am
+++ b/avahi-utils/avahi/Makefile.am
@@ -18,6 +18,9 @@
 # USA.
 
 avahidir = $(pythondir)/avahi
+
+if HAVE_PYTHON
 avahi_PYTHON = __init__.py SimpleGladeApp.py
+endif
 
-EXTRA_DIST = $(avahi_PYTHON)
+EXTRA_DIST = __init__.py SimpleGladeApp.py

diff --git a/bootstrap.sh b/bootstrap.sh
index c5fb4f29c034ea0d9209d2e55fb2e1e75acfd66d..3fb4fbed716814e0821e57b896e603556393dc1e 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,7 +28,7 @@ run_versioned() {
 
 if [ "x$1" = "xam" ] ; then
     set -ex
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake 1.9 -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -36,10 +36,10 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.7
+    run_versioned aclocal 1.9
     libtoolize -c --force
     autoheader
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake 1.9 -a -c --foreign
     autoconf -Wall
 
     CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"

diff --git a/configure.ac b/configure.ac
index 9fa67b176cc82217e4b7094be81a21e184f80ae2..8b6d4d3f1b5a1f7a8062b8b315c2e0f54a5f76b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -216,7 +216,9 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
 AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
-AM_PATH_PYTHON(2.4)
+HAVE_PYTHON=fuck
+AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])
 
 AC_CONFIG_FILES([
 Makefile 
@@ -253,7 +255,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}