diff options
Diffstat (limited to 'src/scripts/Configure-Makefile')
| -rwxr-xr-x | src/scripts/Configure-Makefile | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile index 61368ecb3..df597a864 100755 --- a/src/scripts/Configure-Makefile +++ b/src/scripts/Configure-Makefile @@ -150,7 +150,7 @@ rm -f ./$mftepcp ./$mftepcp2 egrep "^[$st]*(AUTH|LOOKUP)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \ sed "s/[$st]*=/='/" | \ sed "s/\$/'/" > $mftt -egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \ +egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE2?_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \ sed "s/[$st]*=/='/" | \ sed "s/\$/'/" >> $mftt if test -s $mftt @@ -233,12 +233,32 @@ then PCRE_CONFIG) case $PCRE_CONFIG in yes|YES|y|Y) - cflags=`pcre-config --cflags` + echo >&2 "pcre is no longer supported; migrate to pcre2" + exit 1 + +# cflags=`pcre-config --cflags` +# if [ $? -ne 0 ]; then +# echo >&2 "*** Missing pcre-config for regular expression support" +# exit 1 +# fi +# libs=`pcre-config --libs` +# if [ ".$cflags" != "." ]; then +# echo "INCLUDE += $cflags" +# fi +# echo "PCRE_LIBS=$libs" + ;; + esac + ;; + + PCRE2_CONFIG) + case $PCRE2_CONFIG in + yes|YES|y|Y) + cflags=`pcre2-config --cflags` if [ $? -ne 0 ]; then - echo >&2 "*** Missing pcre-config for regular expression support" + echo >&2 "*** Missing pcre2-config for regular expression support" exit 1 fi - libs=`pcre-config --libs` + libs=`pcre2-config --libs8` if [ ".$cflags" != "." ]; then echo "INCLUDE += $cflags" fi |