diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | lib/Makefile.am | 11 |
2 files changed, 14 insertions, 13 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 diff --git a/lib/Makefile.am b/lib/Makefile.am index ebec015d8..a12c00e18 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -69,16 +69,23 @@ memdebug.h inet_ntoa_r.h http_chunks.c http_chunks.h strtok.c strtok.h \ connect.c connect.h llist.c llist.h hash.c hash.h multi.c \ content_encoding.c content_encoding.h share.c share.h http_digest.c \ md5.c md5.h http_digest.h http_negotiate.c http_negotiate.h \ -http_ntlm.c http_ntlm.h +http_ntlm.c http_ntlm.h ca-bundle.h noinst_HEADERS = setup.h transfer.h +BUILT_SOURCES = $(srcdir)/getdate.c $(srcdir)/ca-bundle.h + # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule. $(srcdir)/getdate.c: getdate.y cd $(srcdir) && \ $(YACC) $(YFLAGS) getdate.y; \ mv -f y.tab.c getdate.c +$(srcdir)/ca-bundle.h: Makefile.in Makefile + cd $(srcdir) && \ + echo "/* The file is generated automaticly */" > $@ + echo '#define CURL_CA_BUNDLE @CURL_CA_BUNDLE@' >> $@ + install-data-hook: @if test -n "@CURL_CA_BUNDLE@"; then \ $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \ @@ -88,4 +95,4 @@ install-data-hook: # this hook is mainly for non-unix systems to build even if configure # isn't run dist-hook: - cp $(srcdir)/ca-bundle.h.in $(distdir)/ca-bundle.h + echo "/* ca bundle path set in here*/" > $(distdir)/ca-bundle.h |