diff options
author | Patrick Monnerat <patrick.monnerat@dh.com> | 2016-02-08 14:52:18 +0100 |
---|---|---|
committer | Patrick Monnerat <patrick.monnerat@dh.com> | 2016-02-08 14:52:18 +0100 |
commit | c4303fd5bb26c54a90a8e1ab4380f615995dd0c6 (patch) | |
tree | 56e18e7af6ea609191edd7bb189c74377f01be68 /acinclude.m4 | |
parent | 8893a45e7664b596e62b04b4d7260641cf1769df (diff) | |
parent | e49ab0a3b8891988de54b2af1e79ad89a9be04e5 (diff) |
Merge branch 'master' of github.com:curl/curl
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ce61ca6b5..037c27d7c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2665,6 +2665,24 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), if test "x$ca" = "xno" && test "x$capath" = "xno"; then AC_MSG_RESULT([no]) fi + + AC_MSG_CHECKING([whether to use builtin CA store of SSL library]) + AC_ARG_WITH(ca-fallback, +AC_HELP_STRING([--with-ca-fallback], [Use the built in CA store of the SSL library]) +AC_HELP_STRING([--without-ca-fallback], [Don't use the built in CA store of the SSL library]), + [ + if test "x$with_ca_fallback" != "xyes" -a "x$with_ca_fallback" != "xno"; then + AC_MSG_ERROR([--with-ca-fallback only allows yes or no as parameter]) + fi + ], + [ with_ca_fallback="no"]) + AC_MSG_RESULT([$with_ca_fallback]) + if test "x$with_ca_fallback" = "xyes"; then + if test "x$OPENSSL_ENABLED" != "x1" -a "x$GNUTLS_ENABLED" != "x1"; then + AC_MSG_ERROR([--with-ca-fallback only works with OpenSSL or GnuTLS]) + fi + AC_DEFINE_UNQUOTED(CURL_CA_FALLBACK, 1, [define "1" to use built in CA store of SSL library ]) + fi ]) |