From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 12 Dec 2016 06:45:11 +0000 (+0000)
Subject: Fixes to --with-pcre. Refuse to consider --without-pcre, that is
X-Git-Tag: 2.5.0-alpha~928
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9df8eff5cf5f430d0f7f72c05925f2b07b45c45;p=thirdparty%2Fapache%2Fhttpd.git

Fixes to --with-pcre. Refuse to consider --without-pcre, that is
nonsequitor.



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

diff --git a/configure.in b/configure.in
index 5e70d7aee00..4de5d4b7310 100644
--- a/configure.in
+++ b/configure.in
@@ -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