summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Lloyd <lathiat@bur.st>2005-08-30 16:22:42 +0000
committerTrent Lloyd <lathiat@bur.st>2005-08-30 16:22:42 +0000
commit068ac4c5af4acfc00c385af7f144305978efbba9 (patch)
tree374f1dcf755552eefceacf4fe6acbe64ce6df345
parent3701706c65de0f0b5f652b0cd37670c03800b4a2 (diff)
* This should solve the avahi-bookmarks and checking for python modules problems more elegantly
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@504 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-utils/Makefile.am4
-rwxr-xr-xavahi-utils/avahi-bookmarks.in7
-rw-r--r--configure.ac33
3 files changed, 36 insertions, 8 deletions
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 3adf84c..f5c69fa 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -35,11 +35,11 @@ EXTRA_DIST = \
if HAVE_PYTHON
-if HAVE_DBUS
+if HAVE_PYTHON_DBUS
SUBDIRS=avahi
-if HAVE_GTK
+if HAVE_PYGTK
desktopdir = $(datadir)/applications
desktop_DATA = avahi-discover.desktop
diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-utils/avahi-bookmarks.in
index 39c1d8c..ac8d3da 100755
--- a/avahi-utils/avahi-bookmarks.in
+++ b/avahi-utils/avahi-bookmarks.in
@@ -74,7 +74,10 @@ class AvahiBookmarks(resource.Resource):
for k in l:
if k[:5] == "path=":
- return k[5:]
+ if k[5]:
+ return "/" + k[5:]
+ else
+ return k[5:]
return "/"
@@ -101,7 +104,7 @@ class AvahiBookmarks(resource.Resource):
else:
ip = v[2]
- t += '<li><a href="%s://%s%s/%s">%s</a></li>' % (urlproto[k[3]], ip, port, path, k[2])
+ t += '<li><a href="%s://%s%s%s">%s</a></li>' % (urlproto[k[4]], ip, port, path, k[2])
t += '</ul>'
diff --git a/configure.ac b/configure.ac
index 5cab52c..8732a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,12 +342,37 @@ AC_ARG_ENABLE(python,
if test "x$HAVE_PYTHON" = "xyes" ; then
AM_PATH_PYTHON([2.4])
- if test "x$HAVE_GTK" = "xyes" ; then
- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module pygtk)])
+
+ AC_ARG_ENABLE(pygtk,
+ AS_HELP_STRING([--disable-pygtk],[Disable use of GTK in Python]),
+ [case "${enableval}" in
+ yes) HAVE_PYGTK=yes ;;
+ no) HAVE_PYGTK=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-pygtk) ;;
+ esac],
+ [HAVE_PYGTK=yes])
+
+ if "x$HAVE_PYGTK" = "xyes" ; then
+ AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
fi
- if test "x$HAVE_DBUS" = "xyes" ; then
+
+ 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]),
+ [case "${enableval}" in
+ yes) HAVE_PYTHON_DBUS=yes ;;
+ no) HAVE_PYTHON_DBUS=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-python-dbus) ;;
+ esac],
+ [HAVE_PYTHON_DBUS=yes])
+
+ if "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)])
@@ -481,7 +506,7 @@ fi
BUILD_UTILS="no (!)"
-if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" ; 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_PYTHON_GTK"; then
BUILD_UTILS=yes
fi