mirror of https://github.com/moparisthebest/curl
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
This commit is contained in:
parent
993cdcd6ee
commit
7b074a460b
11
acinclude.m4
11
acinclude.m4
|
@ -2619,8 +2619,10 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
|
||||||
fi
|
fi
|
||||||
capath="$want_capath"
|
capath="$want_capath"
|
||||||
ca="no"
|
ca="no"
|
||||||
else
|
elif test "x$cross_compiling" != "xyes"; then
|
||||||
dnl neither of --with-ca-* given
|
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 first try autodetecting a CA bundle , then a CA path
|
||||||
dnl both autodetections can be skipped by --without-ca-*
|
dnl both autodetections can be skipped by --without-ca-*
|
||||||
ca="no"
|
ca="no"
|
||||||
|
@ -2656,10 +2658,11 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
dnl no option given and cross-compiling
|
||||||
|
AC_MSG_WARN([skipped the ca-cert path detection when cross-compiling])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$ca" != "xno"; then
|
if test "x$ca" != "xno"; then
|
||||||
CURL_CA_BUNDLE='"'$ca'"'
|
CURL_CA_BUNDLE='"'$ca'"'
|
||||||
AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [Location of default ca bundle])
|
AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [Location of default ca bundle])
|
||||||
|
|
Loading…
Reference in New Issue