* 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
from twisted.internet import reactor
from twisted.web import server, resource
except ImportError:
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" }
sys.exit(1)
urlproto = { "_http._tcp" : "http", "_https._tcp" : "https", "_ftp._tcp" : "ftp" }
# $Id$
# This file is part of avahi.
# $Id$
# This file is part of avahi.
with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
if test "z$with_distro" = "z"; then
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
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])
AC_TYPE_MODE_T
AC_TYPE_PID_T
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
+