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

* comment out sebest's pygtk stuff in configure.ac for now


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

6 files changed, 70 insertions, 49 deletions

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index c2c7842..0079795 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -19,12 +19,37 @@
 
 SUBDIRS=avahi
 
+pythonscripts = \
+	avahi-publish-address \
+	avahi-publish-service \
+	avahi-dump-all \
+	avahi-discover 
+
+EXTRA_DIST = \
+	avahi-publish-address.in \
+	avahi-publish-service.in \
+	avahi-dump-all.in \
+	avahi-discover.in 
+
 if HAVE_PYTHON
-bin_SCRIPTS = 			\
-	avahi-publish-address 	\
-	avahi-publish-service 	\
-	avahi-dump-all 		\
-	avahi-discover
+bin_SCRIPTS = $(pythonscripts)
 endif
 
-CLEANFILES = $(bin_SCRIPTS)
+avahi-publish-address: avahi-publish-address.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-publish-service: avahi-publish-service.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-dump-all: avahi-dump-all.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-discover: avahi-discover.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+		-e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
+	chmod +x $@
+
+CLEANFILES = $(pythonscripts)
diff --git a/avahi-utils/avahi-discover.in b/avahi-utils/avahi-discover.in
index fc518db..404d228 100755
--- a/avahi-utils/avahi-discover.in
+++ b/avahi-utils/avahi-discover.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$
 
@@ -35,7 +35,7 @@ service_type_browsers = {}
 service_browsers = {}
 
 
-glade_dir = "@prefix@/share/@PACKAGE@/interfaces"
+glade_dir = "@interfacesdir@"
 
 class Main_window(SimpleGladeApp):
     def __init__(self, path="avahi-discover.glade", root="main_window", domain=None, **kwargs):
diff --git a/avahi-utils/avahi-dump-all.in b/avahi-utils/avahi-dump-all.in
index 94fcf42..ca61ebe 100755
--- a/avahi-utils/avahi-dump-all.in
+++ b/avahi-utils/avahi-dump-all.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$ 
 
diff --git a/avahi-utils/avahi-publish-address.in b/avahi-utils/avahi-publish-address.in
index afa16e9..1942a69 100755
--- a/avahi-utils/avahi-publish-address.in
+++ b/avahi-utils/avahi-publish-address.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$
 
diff --git a/avahi-utils/avahi-publish-service.in b/avahi-utils/avahi-publish-service.in
index 123e376..de25957 100755
--- a/avahi-utils/avahi-publish-service.in
+++ b/avahi-utils/avahi-publish-service.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$
 
diff --git a/configure.ac b/configure.ac
index dee7593..95fc1aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,39 +238,39 @@ 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
-PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ)
-PYGTK_DIR="`$PKG_CONFIG --variable=pyexecdir pygtk-2.0`"
-AC_SUBST(PYGTK_DIR)
-AC_MSG_NOTICE(Using pygtk installed in $PYGTK_DIR)
-PYGTK_VERSION="`$PKG_CONFIG --modversion pygtk-2.0`"
-if test "x$PYGTK_VERSION" = "x2.5.2"
-then
-  AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version])
-fi
-export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH
-
-# check for gtk.glade
-AC_MSG_CHECKING(for gtk.glade)
-prog="
-import sys
-try:
-  import gtk.glade
-except RuntimeError:
-  sys.exit(0)
-except ImportError:
-  sys.exit(1)
-sys.exit(0)
-"
-
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-then
-  AC_MSG_RESULT(found)
-else
-  AC_MSG_RESULT(not found)
-  AC_MSG_ERROR([You need to have python libglade bindings installed])
-fi
-
-dnl ==========================================================================
+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 
@@ -287,16 +287,12 @@ initscript/SUSE/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile
 avahi-utils/avahi/Makefile
-avahi-utils/avahi-dump-all
-avahi-utils/avahi-publish-service
-avahi-utils/avahi-publish-address
-avahi-utils/avahi-discover
 examples/Makefile
 common/Makefile
 ])
 AC_OUTPUT
 
-dnl ==========================================================================
+# ==========================================================================
 echo "
  ---{ $PACKAGE_NAME $VERSION }---