about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2016-03-03 23:37:27 +0200
committerPeter Stephenson <pws@zsh.org>2016-03-04 12:02:18 +0000
commit77e55b1ea315776130822df92f04ba2ca999ca01 (patch)
tree3e149ff171bcea35578cca3ae8221158c3d91800
parent564fb25e821bdd143d23c4e22bc98254b0f8dd59 (diff)
downloadzsh-77e55b1ea315776130822df92f04ba2ca999ca01.tar.gz
zsh-77e55b1ea315776130822df92f04ba2ca999ca01.tar.xz
zsh-77e55b1ea315776130822df92f04ba2ca999ca01.zip
38084: Use previously located pcre-config for libs
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 691f54c77..28ac59bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-04  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 38084: Baruch Siach: configure.ac: use the pcre-config we
+	found earlier for determining libs.
+
 2016-03-03  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 38048: Src/zle_refresh.c: fix "zle redisplay" when called while
diff --git a/configure.ac b/configure.ac
index c3bd713c1..9947b1606 100644
--- a/configure.ac
+++ b/configure.ac
@@ -925,7 +925,7 @@ fi
 if test x$enable_pcre = xyes; then
 dnl pcre-config should probably be employed here
 dnl AC_SEARCH_LIBS(pcre_compile, pcre)
-  LIBS="`pcre-config --libs` $LIBS"
+  LIBS="`$ac_cv_prog_PCRECONF --libs` $LIBS"
 fi
 
 dnl ---------------------