diff options
| author | Paul Eggert | 2014-05-10 19:27:53 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-05-10 19:27:53 -0700 |
| commit | eab25ea7c0d59af4a753cc4ac7c119e5528e8a42 (patch) | |
| tree | 631375bebe66012f1794bdc98e050ecdfd07e29f | |
| parent | 2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53 (diff) | |
| download | emacs-eab25ea7c0d59af4a753cc4ac7c119e5528e8a42.tar.gz emacs-eab25ea7c0d59af4a753cc4ac7c119e5528e8a42.zip | |
Require pkg-config 0.26 or later.
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.
Fixes: debbugs:17438
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 8 insertions, 1 deletions
| @@ -1,3 +1,10 @@ | |||
| 1 | 2014-05-11 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Require pkg-config 0.26 or later (Bug#17438). | ||
| 4 | Earlier versions are buggy, as pkg-config --libs can output | ||
| 5 | nothing, which causes xrandr link failures. | ||
| 6 | * configure.ac (PKG_PROG_PKG_CONFIG): Bump from 0.9.0 to 0.26. | ||
| 7 | |||
| 1 | 2014-05-07 Glenn Morris <rgm@gnu.org> | 8 | 2014-05-07 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * autogen.sh: Check for failing aclocal. | 10 | * autogen.sh: Check for failing aclocal. |
diff --git a/configure.ac b/configure.ac index d398e31f89e..a1dcca014be 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1349,7 +1349,7 @@ searched by pkg-config]) | |||
| 1349 | pre_PKG_CONFIG_CFLAGS=$CFLAGS | 1349 | pre_PKG_CONFIG_CFLAGS=$CFLAGS |
| 1350 | pre_PKG_CONFIG_LIBS=$LIBS | 1350 | pre_PKG_CONFIG_LIBS=$LIBS |
| 1351 | 1351 | ||
| 1352 | PKG_PROG_PKG_CONFIG(0.9.0) | 1352 | PKG_PROG_PKG_CONFIG(0.26) |
| 1353 | 1353 | ||
| 1354 | dnl EMACS_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4) | 1354 | dnl EMACS_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4) |
| 1355 | dnl acts like PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, | 1355 | dnl acts like PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, |