diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-03 21:47:06 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-03 21:47:06 +0000 |
| commit | b78eacbd64af799754684e3fe3569f0ba4ec92f3 (patch) | |
| tree | b46d8a3955c5faefc5f27e48e1d5de8389528997 | |
| parent | 3a625af272ee8c6f878ba4d44ed1c741a1582395 (diff) | |
* Don't require python for build
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@217 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-utils/avahi/Makefile.am | 5 | ||||
| -rwxr-xr-x | bootstrap.sh | 6 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/avahi-utils/avahi/Makefile.am b/avahi-utils/avahi/Makefile.am index cbabcc5..248bf69 100644 --- 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 c5fb4f2..3fb4fbe 100755 --- 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 9fa67b1..8b6d4d3 100644 --- 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} |