Commit 2c2baa93 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

only check for CA bundle path if build with SSL support 

set a conditional for the makefile if we know the CA path or not
parent f0278ca1

configure.ac

+34 −32
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ dnl ********************************************************************** 


dnl Default to compiler & linker defaults for SSL files & libraries.

OPT_SSL=off

dnl Default to no CA bundle

ca="no"

AC_ARG_WITH(ssl,dnl

AC_HELP_STRING([--with-ssl=PATH],[where to look for SSL, PATH points to the SSL installation (default: /usr/local/ssl)])

AC_HELP_STRING([--without-ssl], [disable SSL]),
@@ -626,13 +628,29 @@ else 


    AC_SUBST(OPENSSL_ENABLED)



    AC_MSG_CHECKING([CA cert bundle install path])



    AC_ARG_WITH(ca-bundle,

AC_HELP_STRING([--with-ca-bundle=FILE], [File name to install the CA bundle as])

AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),

    [ ca="$withval" ],

    [

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

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

      else

        ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"

      fi

    ] )



  if test X"$OPT_SSL" != Xoff &&

     test "$OPENSSL_ENABLED" != "1"; then

    AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])

    if test X"$OPT_SSL" = Xno; then

      ca="no"

    fi



    if test "x$ca" != "xno"; then

      CURL_CA_BUNDLE='"'$ca'"'

      AC_SUBST(CURL_CA_BUNDLE)  

    fi

    AC_MSG_RESULT([$ca])



    dnl these can only exist if openssl exists
@@ -642,6 +660,15 @@ else 


  fi



  if test X"$OPT_SSL" != Xoff &&

     test "$OPENSSL_ENABLED" != "1"; then

    AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])

  fi



fi



AM_CONDITIONAL(CABUNDLE, test x$ca != xno)



dnl **********************************************************************

dnl Check for the presence of ZLIB libraries and headers

dnl **********************************************************************
@@ -881,31 +908,6 @@ AC_PATH_PROGS( NROFF, gnroff nroff, , 
  $PATH:/usr/bin/:/usr/local/bin )

AC_SUBST(NROFF)



AC_MSG_CHECKING([CA cert bundle install path])



AC_ARG_WITH(ca-bundle,

AC_HELP_STRING([--with-ca-bundle=FILE], [File name to install the CA bundle as])

AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),

   [ ca="$withval" ],

   [

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

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

  else

    ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"

  fi

   ] )



if test X"$OPT_SSL" = Xno

then

  ca="no"

fi



if test "x$ca" != "xno"; then

  CURL_CA_BUNDLE='"'$ca'"'

  AC_SUBST(CURL_CA_BUNDLE)  

fi

AC_MSG_RESULT([$ca])



AC_PROG_YACC



dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib,