[Emacs-diffs] trunk r117082: Require pkg-config 0.26 or later in autogen.sh only.

[Paul Eggert]

------------------------------------------------------------
revno: 117082
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17438
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2014-05-10 19:47:57 -0700
message:
  Require pkg-config 0.26 or later in autogen.sh only.
  
  * autogen.sh (pkg_config_min): Make this at least 0.26.
  * configure.ac (PKG_PROG_PKG_CONFIG): Revert back to 0.9.0.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  autogen.sh                     autogen.sh-20091113204419-o5vbwnq5f7feedwu-2495
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-11 02:27:53 +0000
+++ b/ChangeLog 2014-05-11 02:47:57 +0000
@@ -3,7 +3,7 @@
        Require pkg-config 0.26 or later (Bug#17438).
        Earlier versions are buggy, as pkg-config --libs can output
        nothing, which causes xrandr link failures.
-       * configure.ac (PKG_PROG_PKG_CONFIG): Bump from 0.9.0 to 0.26.
+       * autogen.sh (pkg_config_min): Make this at least 0.26.
 
 2014-05-07  Glenn Morris  <address@hidden>
 

=== modified file 'autogen.sh'
--- a/autogen.sh        2014-05-07 16:56:34 +0000
+++ b/autogen.sh        2014-05-11 02:47:57 +0000
@@ -42,6 +42,11 @@
 automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`
 
 pkg_config_min=`sed -n 's/^ *PKG_PROG_PKG_CONFIG(\([0-9\.]*\)).*/\1/p' 
configure.ac`
+# Building from the repository needs pkg-config 0.26 or later; see Bug#17438.
+case $pkg_config_min in
+  0.[0-9] | 0.[0-9].* | 0.1[0-9] | 0.1[0-9].* | 0.2[0-5] | 0.2[0-5].* )
+    pkg_config_min=0.26
+esac
 
 ## $1 = program, eg "autoconf".
 ## Echo the version string, eg "2.59".

=== modified file 'configure.ac'
--- a/configure.ac      2014-05-11 02:27:53 +0000
+++ b/configure.ac      2014-05-11 02:47:57 +0000
@@ -1349,7 +1349,7 @@
 pre_PKG_CONFIG_CFLAGS=$CFLAGS
 pre_PKG_CONFIG_LIBS=$LIBS
 
-PKG_PROG_PKG_CONFIG(0.26)
+PKG_PROG_PKG_CONFIG(0.9.0)
 
 dnl EMACS_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4)
 dnl acts like PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4,