summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/Modules/pcre.mdd2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a44700bbe..7cc2d1329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-10-26  Peter Stephenson  <pws@csr.com>
 
+	* 29865: Src/Modules/pcre.mdd: don't compile if no pcre-config.
+
 	* 29859: Src/Zle/Complete.c: compadd handles its own options.
 
 2011-10-24  Peter Stephenson  <pws@csr.com>
@@ -15504,5 +15506,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5485 $
+* $Revision: 1.5486 $
 *****************************************************
diff --git a/Src/Modules/pcre.mdd b/Src/Modules/pcre.mdd
index 3e1579117..6eb3c691b 100644
--- a/Src/Modules/pcre.mdd
+++ b/Src/Modules/pcre.mdd
@@ -1,5 +1,5 @@
 name=zsh/pcre
-link=`if test x$enable_pcre = xyes; then echo dynamic; else echo no; fi`
+link=`if test x$enable_pcre = xyes && (pcre-config --version >/dev/null 2>/dev/null); then echo dynamic; else echo no; fi`
 load=no
 
 autofeatures="b:pcre_compile b:pcre_study b:pcre_match"