From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 12 Dec 2016 20:51:17 +0000 (+0000)
Subject: Need to preserve --with-pcre value if not a path ref
X-Git-Tag: 2.5.0-alpha~919
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c960136851d6141ec08e782cb8fba418e91267b5;p=thirdparty%2Fapache%2Fhttpd.git

Need to preserve --with-pcre value if not a path ref

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

diff --git a/configure.in b/configure.in
index 659f6e61dc2..19ce9e73741 100644
--- a/configure.in
+++ b/configure.in
@@ -224,9 +224,10 @@ AC_ARG_WITH(pcre,
 APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
 if test "x$with_pcre" = "x" || test "$with_pcre" = "yes"; then
   with_pcre="$PATH"
-else
+else if which $with_pcre 2>/dev/null; then :; else
   with_pcre="$with_pcre/bin:$with_pcre"
 fi
+fi
 
 AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config],
                       [`which $with_pcre 2>/dev/null`], $with_pcre)