Commit 073b03fa authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

acinclude: fix --without-ca-path when cross-compiling 

The commit 7b074a46 to CURL_CHECK_CA_BUNDLE in 7.31 (don't check
for paths when cross-compiling) causes --without-ca-path to no longer
works when cross-compiling, since ca and capath only ever get set to
"no" when not cross-compiling, I attach a patch that works for me. Also
in the cross-compilation case, no ca-path seems to be a better default
(IMVHO) than empty ca-path.

Bug: http://curl.haxx.se/bug/view.cgi?id=1273
Patch-by: Stefan Neis
parent f73f0520

acinclude.m4

+37 −36
Original line number Diff line number Diff line
@@ -2619,18 +2619,18 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), 
    fi

    capath="$want_capath"

    ca="no"

  elif test "x$cross_compiling" != "xyes"; then

    dnl NOT cross-compiling and...

    dnl neither of the --with-ca-* options are provided



  else

    dnl first try autodetecting a CA bundle , then a CA path

    dnl both autodetections can be skipped by --without-ca-*

    ca="no"

    capath="no"

    if test "x$cross_compiling" != "xyes"; then

      dnl NOT cross-compiling and...

      dnl neither of the --with-ca-* options are provided

      if test "x$want_ca" = "xunset"; then

        dnl the path we previously would have installed the curl ca bundle

      dnl to, and thus we now check for an already existing cert in that place

      dnl in case we find no other

        dnl to, and thus we now check for an already existing cert in that

        dnl place in case we find no other

        if test "x$prefix" != xNONE; then

          cac="${prefix}/share/curl/curl-ca-bundle.crt"

        else
@@ -2662,6 +2662,7 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), 
      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

    CURL_CA_BUNDLE='"'$ca'"'