[Emacs-diffs] trunk r117055: * autogen.sh: If all else fails, try using pkg-config to find pkg.m4.

[Glenn Morris]

------------------------------------------------------------
revno: 117055
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-05-03 11:24:10 -0700
message:
  * autogen.sh: If all else fails, try using pkg-config to find pkg.m4.
  This is an attempt to get hydra builds working again.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  autogen.sh                     autogen.sh-20091113204419-o5vbwnq5f7feedwu-2495

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-03 16:27:17 +0000
+++ b/ChangeLog 2014-05-03 18:24:10 +0000
@@ -1,3 +1,7 @@
+2014-05-03  Glenn Morris  <address@hidden>
+
+       * autogen.sh: If all else fails, try using pkg-config to find pkg.m4.
+
 2014-05-03  Paul Eggert  <address@hidden>
 
        Get --enable-gcc-warnings to work after touching configure.ac.

=== modified file 'autogen.sh'
--- a/autogen.sh        2014-05-03 16:27:17 +0000
+++ b/autogen.sh        2014-05-03 18:24:10 +0000
@@ -234,6 +234,28 @@
   done
   IFS=$oIFS
 
+  ## OK, maybe pkg-config is in a weird place (eg on hydra).
+  if test -z "$AUTORECONF_ENV"; then
+    oIFS=$IFS
+    IFS=:
+    for dir in $PATH; do
+      if test -x "$dir/pkg-config"; then
+        ac_dir=`echo "$dir" | sed 's|bin$|share/aclocal|'`
+        if test -r "$ac_dir/pkg.m4"; then
+          case $ACLOCAL_PATH in
+            '') ACLOCAL_PATH=$ac_dir;;
+            ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;;
+          esac
+          export ACLOCAL_PATH
+          AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'"
+          env_space=' '
+          break
+        fi
+      fi
+    done
+    IFS=$oIFS
+  fi
+
   if test -z "$AUTORECONF_ENV"; then
     cat <<EOF
 The version of aclocal that you are using cannot find the pkg.m4 file that