summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Lloyd <lathiat@bur.st>2005-08-24 09:36:56 +0000
committerTrent Lloyd <lathiat@bur.st>2005-08-24 09:36:56 +0000
commit4f30e1b329fe8479d372a0b8c42f05893be5faed (patch)
treed3cc8dfb4e1d4cc59aa9ed7671dd6b0955ed4e5f
parent5aed54b2ce23d07f45d90142b2cb4a1b95913588 (diff)
* 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
-rwxr-xr-xavahi-utils/avahi-bookmarks.in2
-rwxr-xr-xbootstrap.sh2
-rw-r--r--configure.ac14
3 files changed, 13 insertions, 5 deletions
diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-utils/avahi-bookmarks.in
index ce8eba1..07ca8f0 100755
--- 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 d24de75..4d8d545 100755
--- 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 d53dc76..c041dbc 100644
--- 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
#