summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@hasufell.de>2015-02-07 22:06:40 +0100
committerDaniel Stenberg <daniel@haxx.se>2015-02-20 16:30:04 +0100
commit90314100e0880144b2d8b7f7d02c51df9d6beece (patch)
treea120e174c3ee00458da94f2ccb3d1e020d9d7174 /acinclude.m4
parent20112ed8467c492a923b0ed2fb2d878c1a14ba44 (diff)
downloadcurl-90314100e0880144b2d8b7f7d02c51df9d6beece.tar.gz
configure: allow both --with-ca-bundle and --with-ca-path
SSL_CTX_load_verify_locations by default (and if given non-Null parameters) searches the CAfile first and falls back to CApath. This allows for CAfile to be a basis (e.g. installed by the package manager) and CApath to be a user configured directory. This wasn't reflected by the previous configure constraint which this patch fixes. Bug: https://github.com/bagder/curl/pull/139
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m49
1 files changed, 6 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 453358dc9..6ed7ffbc1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2607,7 +2607,8 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
if test "x$want_ca" != "xno" -a "x$want_ca" != "xunset" -a \
"x$want_capath" != "xno" -a "x$want_capath" != "xunset"; then
dnl both given
- AC_MSG_ERROR([Can't specify both --with-ca-bundle and --with-ca-path.])
+ ca="$want_ca"
+ capath="$want_capath"
elif test "x$want_ca" != "xno" -a "x$want_ca" != "xunset"; then
dnl --with-ca-bundle given
ca="$want_ca"
@@ -2669,11 +2670,13 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [Location of default ca bundle])
AC_SUBST(CURL_CA_BUNDLE)
AC_MSG_RESULT([$ca])
- elif test "x$capath" != "xno"; then
+ fi
+ if test "x$capath" != "xno"; then
CURL_CA_PATH="\"$capath\""
AC_DEFINE_UNQUOTED(CURL_CA_PATH, "$capath", [Location of default ca path])
AC_MSG_RESULT([$capath (capath)])
- else
+ fi
+ if test "x$ca" == "xno" && test "x$capath" == "xno"; then
AC_MSG_RESULT([no])
fi
])