Merge pull request #2975 from martinhsv/v2/master

Configure: do not check for pcre1 if pcre2 requested

build/find_pcre.m4

@@ -21,6 +21,9 @@ AC_ARG_WITH(
     [test_paths="${with_pcre}"],
     [test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr"])
 
+if test "x${with_pcre2}" != "x" && test "x${with_pcre2}" != "xno"; then
+    AC_MSG_NOTICE([pcre2 specified; omitting check for pcre])
+else
     AC_MSG_CHECKING([for libpcre config script])
 
     dnl # Determine pcre lib directory
@@ -86,4 +89,5 @@ else
         AC_MSG_NOTICE([using pcre v${PCRE_VERSION}])
         ifelse([$1], , , $1) 
     fi 
+fi
 ])