From d54b026b565319d06cbd75a9b2075a71381bc0e2 Mon Sep 17 00:00:00 2001
From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Sat, 31 Jan 2009 20:08:46 +0100
Subject: Move the safety check about pkg-config in bootstrap.sh.

Don't check twice for pkg-config during configure, since the undefined
macro would be possibly caused on a different system.
---
 bootstrap.sh | 9 +++++++++
 configure.ac | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 6bc1306..ce5d7e4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -42,6 +42,15 @@ run_versioned() {
 
 set -ex
 
+# We check for this here, because if pkg-config is not found in the
+# system, it's likely that the pkg.m4 macro file is also not present,
+# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
+# configure file faulty.
+if ! pkg-config --version &>/dev/null; then
+    echo "pkg-config is required to bootstrap this program" &>/dev/null
+    exit 1
+fi
+
 if [ "x$1" = "xam" ] ; then
     run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
diff --git a/configure.ac b/configure.ac
index 3f1a841..014bb1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,14 +158,6 @@ AM_ICONV
 
 #### pkg-config ####
 
-# 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
 
 #### ALSA support (optional) ####
-- 
cgit