diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-07-04 18:15:25 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-07-04 18:15:25 +0000 |
| commit | 756bc0f4b7712231eaca4d4c3bea19d0d4c0ac92 (patch) | |
| tree | ed6194085ed57fda97ca374fff959d4779bbf835 /configure.ac | |
| parent | 269d491b6a71b5c3107681d95dcfa7b2baa4b538 (diff) | |
Dan Grayson pointed out that we set the CURL_CA_BUNDLE variable wrongly in
the configure script. We set it differently now and generate the
lib/ca-bundle.h file entirely.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index f4d01bf77..0a099ec0e 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ This configure script may be copied, distributed and modified under the terms of the curl license; see COPYING for more details]) AC_CONFIG_SRCDIR([lib/urldata.h]) -AM_CONFIG_HEADER(lib/config.h src/config.h tests/server/config.h lib/ca-bundle.h) +AM_CONFIG_HEADER(lib/config.h src/config.h tests/server/config.h ) AM_MAINTAINER_MODE AC_PATH_PROG( SED, sed, , $PATH:/usr/bin:/usr/local/bin) @@ -834,7 +834,6 @@ AC_CHECK_FUNCS( socket \ tcgetattr \ perror \ closesocket \ - setvbuf \ sigaction \ signal \ getpass_r \ @@ -890,7 +889,7 @@ 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" + ca="\${prefix}/share/curl/curl-ca-bundle.crt" else ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt" fi @@ -901,15 +900,10 @@ then ca="no" fi -if test "x$ca" = "xno"; then - dnl let's not keep "no" as path name, blank it instead - ca="" -else - AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [CA bundle full path name]) +if test "x$ca" != "xno"; then + CURL_CA_BUNDLE='"'$ca'"' + AC_SUBST(CURL_CA_BUNDLE) fi - -CURL_CA_BUNDLE="$ca" -AC_SUBST(CURL_CA_BUNDLE) AC_MSG_RESULT([$ca]) AC_PROG_YACC |