From 4f30e1b329fe8479d372a0b8c42f05893be5faed Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Wed, 24 Aug 2005 09:36:56 +0000 Subject: * 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 --- configure.ac | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'configure.ac') 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 # -- cgit