aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-04-18 23:37:56 +0200
committerDaniel Stenberg <daniel@haxx.se>2013-04-18 23:37:56 +0200
commit7b074a460b64811e35fbf065bf1133dda976bd71 (patch)
tree319f464404528956c1402f565301ddeac77286eb
parent993cdcd6ee1825df94d8097ca2fb3fa20270fce0 (diff)
CURL_CHECK_CA_BUNDLE: don't check for paths when cross-compiling
When cross-compiling we can't scan and detect existing files or paths. Bug: http://curl.haxx.se/mail/lib-2013-04/0294.html
-rw-r--r--acinclude.m411
1 files changed, 7 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index b37f610f5..5a3906ad0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2619,8 +2619,10 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
fi
capath="$want_capath"
ca="no"
- else
- dnl neither of --with-ca-* given
+ elif test "x$cross_compiling" != "xyes"; then
+ dnl NOT cross-compiling and...
+ dnl neither of the --with-ca-* options are provided
+
dnl first try autodetecting a CA bundle , then a CA path
dnl both autodetections can be skipped by --without-ca-*
ca="no"
@@ -2656,10 +2658,11 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
fi
done
fi
+ else
+ dnl no option given and cross-compiling
+ AC_MSG_WARN([skipped the ca-cert path detection when cross-compiling])
fi
-
-
if test "x$ca" != "xno"; then
CURL_CA_BUNDLE='"'$ca'"'
AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [Location of default ca bundle])