aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2014-05-11 23:09:27 -0700
committerPaul Eggert2014-05-11 23:09:27 -0700
commitffd6d9c4d321e93e301f9cafd1fe054389898978 (patch)
tree63e5e6fcbca54d1c2cf616e9471e5cb27c91fc24
parent3c95f44ce5cefd13f9159e3fdbbf83a02963bf0f (diff)
downloademacs-ffd6d9c4d321e93e301f9cafd1fe054389898978.tar.gz
emacs-ffd6d9c4d321e93e301f9cafd1fe054389898978.zip
* configure.ac (EMACS_CHECK_MODULES): Fix typo in previous change.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cfb4841ade1..c66f6b726f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-05-12 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * configure.ac (EMACS_CHECK_MODULES): Fix typo in previous change.
4
12014-05-11 Paul Eggert <eggert@cs.ucla.edu> 52014-05-11 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Work around bug in pkg-config before 0.26 (Bug#17438). 7 Work around bug in pkg-config before 0.26 (Bug#17438).
diff --git a/configure.ac b/configure.ac
index 286761670b9..a0d6abc4b1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1366,7 +1366,7 @@ AC_DEFUN([EMACS_CHECK_MODULES],
1366 emacs_check_module_ok=false 1366 emacs_check_module_ok=false
1367 AS_IF([test -n "$PKG_CONFIG" && 1367 AS_IF([test -n "$PKG_CONFIG" &&
1368 { $PKG_CONFIG --atleast-pkgconfig-version 0.26 || 1368 { $PKG_CONFIG --atleast-pkgconfig-version 0.26 ||
1369 { $PKG_CONFIG --cflags "$1" "$2" && $PKG_CONFIG --libs "$1" "$2"; } 1369 { $PKG_CONFIG --cflags "$2" && $PKG_CONFIG --libs "$2"; }
1370 } >/dev/null 2>&AS_MESSAGE_LOG_FD], 1370 } >/dev/null 2>&AS_MESSAGE_LOG_FD],
1371 [PKG_CHECK_MODULES([$1], [$2], 1371 [PKG_CHECK_MODULES([$1], [$2],
1372 [$1_CFLAGS=`AS_ECHO(["$$1_CFLAGS"]) | sed -e "$edit_cflags"` 1372 [$1_CFLAGS=`AS_ECHO(["$$1_CFLAGS"]) | sed -e "$edit_cflags"`