diff options
| author | Todd Lyons <tlyons@exim.org> | 2013-10-19 17:01:26 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2013-10-22 04:54:30 -0700 |
| commit | 2519e60d2f6124589a6a5b922dd9ae6bcb6f6588 (patch) | |
| tree | 42466bd6e68ca69fd608f451fd1c1dd4dd30d35f /src/scripts/Configure-Makefile | |
| parent | b3e39dd7f0113be4aeeab16dbe18b9eef8c1caad (diff) | |
Bug 1400: Fix GnuTLS PKCS11 issues
Can disable PKCS11 in Makefile with AVOID_GNUTLS_PKCS11 build flag.
Rename gnutls_enable_pkcs11 option to gnutls_allow_auto_pkcs11.
Update Changelog
Diffstat (limited to 'src/scripts/Configure-Makefile')
| -rwxr-xr-x | src/scripts/Configure-Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile index 58b2b5770..5e8a72683 100755 --- a/src/scripts/Configure-Makefile +++ b/src/scripts/Configure-Makefile @@ -118,7 +118,7 @@ done >> $mft || exit 1 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)[$st]*=[$st]*" $mft | \ +egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \ sed "s/[$st]*=/='/" | \ sed "s/\$/'/" >> $mftt if test -s $mftt @@ -187,6 +187,10 @@ then esac ;; + AVOID_GNUTLS_PKCS11) + echo "$var=yes" + ;; + esac done echo "# End of pkg-config fixups" |