build: require pkg-config for bootstrap

* .gnulib: Update to latest, for bootstrap fixes.
* bootstrap: Synchronize with upstream.
* bootstrap.conf: Add pkg-config pre-requisite.
* autogen.sh: Tweak wording message.
Reported by Justin Clift, and with feedback from Bruno Haible.

diff --git a/.gnulib b/.gnulib
index 9f940e90a7555c3399c9972d9688483c011068c7..2bb63bfb25474ea147ee9f1523c0337997359a4c 160000 (submodule)
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 9f940e90a7555c3399c9972d9688483c011068c7
+Subproject commit 2bb63bfb25474ea147ee9f1523c0337997359a4c

diff --git a/autogen.sh b/autogen.sh
index 3fff381b397073c391822c303d816a0848d8022c..6c2e3bc60e6a9359faea38ccecb0b8fe46753b6c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -49,7 +49,7 @@ if test "$t" = "$(cat $curr_status 2>/dev/null)" \
 else
     echo running bootstrap...
     ./bootstrap && bootstrap_hash > $curr_status \
-      || { echo "Failed to bootstrap gnulib, please investigate."; exit 1; }
+      || { echo "Failed to bootstrap, please investigate."; exit 1; }
 fi
 
 cd "$THEDIR"

diff --git a/bootstrap b/bootstrap
index e94a29a6fb291c37b01c430ec6604f59bf1bbbeb..49b1e5512587fd075547ffb4079f6050a163dbd6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-09-30.17; # UTC
+scriptversion=2010-10-05.15; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -351,7 +351,7 @@ check_versions() {
       app=libtoolize
     fi
     # Honor $APP variables ($TAR, $AUTOCONF, etc.)
-    appvar=`echo $app | tr '[a-z]' '[A-Z]'`
+    appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
     test "$appvar" = TAR && appvar=AMTAR
     eval "app=\${$appvar-$app}"
     inst_ver=$(get_version $app)
@@ -374,7 +374,7 @@ check_versions() {
 print_versions() {
   echo "Program    Min_version"
   echo "----------------------"
-  printf "$buildreq"
+  printf %s "$buildreq"
   echo "----------------------"
   # can't depend on column -t
 }
@@ -392,10 +392,12 @@ if test $use_libtool = 1; then
 fi
 
 if ! printf "$buildreq" | check_versions; then
-  test -f README-prereq &&
-  echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2
-  echo
-  print_versions
+  echo >&2
+  if test -f README-prereq; then
+    echo "See README-prereq for notes on obtaining the prerequisite programs" >&2
+  else
+    echo "Please install the prerequisite programs" >&2
+  fi
   exit 1
 fi
 
@@ -800,7 +802,7 @@ grep -E '^[  ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
 
 for command in \
   libtool \
-  "${ACLOCAL-aclocal} --force -I m4" \
+  "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
   "${AUTOCONF-autoconf} --force" \
   "${AUTOHEADER-autoheader} --force" \
   "${AUTOMAKE-automake} --add-missing --copy --force-missing"

diff --git a/bootstrap.conf b/bootstrap.conf
index 7ce1e5d7a06fb2cd5833e87baa21572614327907..8f25554a3a2e962f043812a67e376601a58c9a77 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -150,6 +150,7 @@ git        1.5.5
 gzip       -
 libtool    -
 perl       5.5
+pkg-config -
 tar        -
 "