From b301478a69d961c724a4875b839a81fb458d1153 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 2 Aug 2011 11:25:13 -0400
Subject: [PATCH] Bug 39763 - autogen.sh should check pkg-config availability

(and revert change have_icu change I mistakenly pushed out)
---
 autogen.sh   | 10 ++++++++--
 configure.ac |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index cdebe07c..833a6219 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,14 +13,20 @@ which ragel || {
 	exit 1
 }
 
+echo -n "checking for pkg-config... "
+which pkg-config || {
+	echo "*** No pkg-config found, please install it ***"
+	exit 1
+}
+
 echo -n "checking for autoreconf... "
 which autoreconf || {
 	echo "*** No autoreconf found, please install it ***"
 	exit 1
 }
 
-echo "running autoreconf"
-autoreconf --force --install || exit $?
+echo "running autoreconf --force --install --verbose"
+autoreconf --force --install --verbose || exit $?
 
 cd $olddir
 echo "running configure $@"
diff --git a/configure.ac b/configure.ac
index 882d218e..d2a23310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,7 +104,6 @@ dnl ==========================================================================
 
 PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
 	AC_CHECK_PROG([have_icu], [icu-config], [true], [false])
-	have_icu=false
 	if $have_icu; then
 		icu_cflags=`icu-config --cppflags`
 		icu_libs=`icu-config --ldflags-libsonly`
-- 
GitLab