* avahi-bookmarks: Mention twisted.web in twisted error message

 * bootstrap.sh: Change interpreter to #!/bin/sh
 * configure.ac:
   - Allow --with-distro=none to bypass check for supported distro
   - Add check for the pkg-config binary

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

diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-utils/avahi-bookmarks.in
index ce8eba13b073e7939fe5640a11f8a4455047b8df..07ca8f06e79decfd6dbd335cf774ae8658379edd 100755 (executable)
--- a/avahi-utils/avahi-bookmarks.in
+++ b/avahi-utils/avahi-bookmarks.in
@@ -38,7 +38,7 @@ try:
     from twisted.internet import reactor
     from twisted.web import server, resource
 except ImportError:
-    print "Sorry, to use this tool you need to install twisted."
+    print "Sorry, to use this tool you need to install twisted and twisted.web."
     sys.exit(1)
 
 urlproto = { "_http._tcp" : "http",  "_https._tcp" : "https", "_ftp._tcp" : "ftp" }

diff --git a/bootstrap.sh b/bootstrap.sh
index d24de757efb015e99afb7984b12a0b41f95397cb..4d8d545bdaad3b669ed3cab7f8173526a8e1b763 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $Id$
 
 # This file is part of avahi.

diff --git a/configure.ac b/configure.ac
index d53dc76d217bc2743566142e439465c6d31184c0..c041dbce0261fdf7ac900f9a9f7e81e7cbea0157 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,14 +59,14 @@ fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 
 if test "z$with_distro" = "z"; then
-    AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO])
+    AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported.])
     exit 1
 else
 case $with_distro in
-    debian|gentoo|archlinux)
+    debian|gentoo|archlinux|none)
      ;;
     *)
-     AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)])
+     AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check])
      ;;
 esac
 fi
@@ -140,6 +140,14 @@ AC_FUNC_STAT
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
 
+# Check for pkg-config manually first, as if its not installed the
+# PKG_PROG_PKG_CONFIG macro won't be defined.
+AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
+
+if test x"$have_pkg_config" == xno; then
+    AC_MSG_ERROR(pkg-config is required to install this program)
+fi
+
 PKG_PROG_PKG_CONFIG
 
 #