]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fixes to --with-pcre. Refuse to consider --without-pcre, that is
authorWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 12 Dec 2016 06:45:11 +0000 (06:45 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 12 Dec 2016 06:45:11 +0000 (06:45 +0000)
nonsequitor.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773741 13f79535-47bb-0310-9956-ffa450edef68

configure.in

index 5e70d7aee0050d83e81c18dea7a591388b8582c8..4de5d4b7310025c2a61377134d9af74bb779a387 100644 (file)
@@ -222,10 +222,16 @@ fi
 
 AC_ARG_WITH(pcre,
 APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
+echo PCRE PATH was $with_pcre
+
+if test "$with_pcre" = "" || test "$with_pcre" = "yes"; then
+  with_pcre = "$PATH"
+else
+  with_pcre = "$with_pcre/bin:$with_pcre"
+fi
 
 AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config],
-                      [`which $with_pcre 2>/dev/null`],
-                      [$with_pcre/bin:$with_pcre])
+                      [`which $with_pcre 2>/dev/null`], $with_pcre)
 
 if test "x$PCRE_CONFIG" != "x"; then
   if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else