diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | buildconf.bat | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/.cvsignore | 1 | ||||
| -rw-r--r-- | lib/Makefile.Watcom | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 24 | ||||
| -rw-r--r-- | lib/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 9 | ||||
| -rw-r--r-- | lib/Makefile.netware | 18 | ||||
| -rw-r--r-- | lib/easy.c | 1 | ||||
| -rw-r--r-- | lib/url.c | 1 | ||||
| -rw-r--r-- | packages/OS400/make-lib.sh | 15 |
13 files changed, 14 insertions, 80 deletions
@@ -6,6 +6,10 @@ Changelog +Michal Marek (31 Mar 2008) +- Removed the generated ca-bundle.h file. The verbatim value of $ca and + $capath is known to configure, so it can be defined in config.h instead. + Daniel Stenberg (31 Mar 2008) - Added CURLFORM_STREAM as a supported option to curl_formadd() to allow an application to provide data for a multipart with the read callback. Note diff --git a/acinclude.m4 b/acinclude.m4 index bdfb6cea1..7af4741ea 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2583,11 +2583,11 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), if test "x$ca" != "xno"; then CURL_CA_BUNDLE='"'$ca'"' - AC_SUBST(CURL_CA_BUNDLE) + AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [Location of default ca bundle]) AC_MSG_RESULT([$ca]) elif test "x$capath" != "xno"; then CURL_CA_PATH="\"$capath\"" - AC_SUBST(CURL_CA_PATH) + AC_DEFINE_UNQUOTED(CURL_CA_PATH, "$capath", [Location of default ca path]) AC_MSG_RESULT([$capath (capath)]) else AC_MSG_RESULT([no]) diff --git a/buildconf.bat b/buildconf.bat index 7c5375715..deeaea904 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -3,11 +3,8 @@ REM set up a CVS tree to build when there's no autotools REM $Revision$
REM $Date$
-REM create ca-bundle.h
-echo /* This file is generated automatically */ >lib\ca-bundle.h
-
REM create hugehelp.c
copy src\hugehelp.c.cvs src\hugehelp.c
REM create Makefile
-copy Makefile.dist Makefile
\ No newline at end of file +copy Makefile.dist Makefile
diff --git a/configure.ac b/configure.ac index e887bac42..e0cd5bfb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1623,9 +1623,6 @@ dnl ********************************************************************** CURL_CHECK_CA_BUNDLE -AM_CONDITIONAL(CABUNDLE, test x$ca != xno) -AM_CONDITIONAL(CAPATH, test x$capath != xno) - dnl ********************************************************************** dnl Check for the presence of IDN libraries and headers dnl ********************************************************************** diff --git a/lib/.cvsignore b/lib/.cvsignore index ad0b7243b..c2a9892c2 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -6,6 +6,5 @@ Makefile .libs config.h stamp-* -ca-bundle.h getdate.c curllib.dsp diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index a3fe6fc6b..8e5118ecb 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -4,7 +4,7 @@ # # $Id$ -TARGETS = ca-bundle.h libcurl_wc.dll libcurl_wc_imp.lib +TARGETS = libcurl_wc.dll libcurl_wc_imp.lib CC = wcc386 @@ -67,9 +67,6 @@ all: $(OBJ_DIR) $(C_ARG) $(TARGETS) .SYMBOLIC $(OBJ_DIR): mkdir $(OBJ_DIR) -ca-bundle.h: - @echo /* dummy ca-bundle.h. Not used */ > $@ - libcurl_wc.dll libcurl_wc_imp.lib: $(OBJS) $(RESOURCE) $(LINK_ARG) wlink name libcurl_wc.dll @$(LINK_ARG) @@ -168,7 +165,7 @@ $(OBJ_DIR)\url.obj: url.c setup.h config-win32.h setup_once.h urldata.h cookie.h transfer.h sendf.h progress.h strequal.h strerror.h escape.h strtok.h & share.h content_encoding.h http_digest.h http_negotiate.h select.h & multiif.h ftp.h dict.h telnet.h tftp.h http.h file.h curl_ldap.h url.h & - connect.h inet_ntop.h http_ntlm.h .\ca-bundle.h & + connect.h inet_ntop.h http_ntlm.h & ..\include\curl\mprintf.h memory.h memdebug.h .\memory.h $(OBJ_DIR)\dict.obj: dict.c setup.h config-win32.h setup_once.h urldata.h cookie.h & ..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\easy.h & diff --git a/lib/Makefile.am b/lib/Makefile.am index 350931df0..c7e810860 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -101,30 +101,6 @@ libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) WIN32SOURCES = $(CSOURCES) WIN32HEADERS = $(HHEADERS) config-win32.h -BUILT_SOURCES = $(top_builddir)/lib/ca-bundle.h - -$(top_builddir)/lib/ca-bundle.h: Makefile.in Makefile - @if test -f $@; then \ - chmod 0644 $@; \ - fi - echo "/* This file is generated automatically */" > $@ -if CABUNDLE - echo '#define CURL_CA_BUNDLE @CURL_CA_BUNDLE@' >> $@ -else - echo '#undef CURL_CA_BUNDLE /* unknown default path */' >> $@ -endif -if CAPATH - echo '#define CURL_CA_PATH @CURL_CA_PATH@' >> $@ -else - echo '#undef CURL_CA_PATH /* unknown default path */' >>$@ -endif - -# this hook is mainly for non-unix systems to build even if configure -# isn't run -dist-hook: - chmod 0644 $(distdir)/ca-bundle.h - echo "/* ca bundle path set in here*/" > $(distdir)/ca-bundle.h - DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP) VCPROJOUT = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ) diff --git a/lib/Makefile.inc b/lib/Makefile.inc index e203d3658..875e56754 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -16,7 +16,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \ if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \ getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h \ strtok.h connect.h llist.h hash.h content_encoding.h share.h md5.h \ - http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h inet_pton.h \ + http_digest.h http_negotiate.h http_ntlm.h inet_pton.h \ strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \ diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index d8131c7df..6fd8b9b7c 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -113,7 +113,7 @@ RESOURCE = libcurl.res .SUFFIXES: .rc .res -all: ca-bundle.h $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) +all: $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) -$(RM) $@ @@ -135,18 +135,13 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC $(RC) $(RCFLAGS) $< -o $@ clean: - -$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) ca-bundle.h + -$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) distrib: clean -$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY) FORCE: ; -ca-bundle.h: FORCE Makefile.m32 - @echo Creating $@ - @echo $(DL)/* Do not edit this file - it is created by make!$(DL) > $@ - @echo $(DL)*/$(DL) >> $@ - $(ARES_LIB)/libcares.a: $(MAKE) -C $(ARES_LIB) -f Makefile.m32 diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 1a4610d85..ae0cc7392 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -230,7 +230,7 @@ nlm: prebuild $(TARGET).nlm lib: prebuild $(TARGET).$(LIBEXT) -prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h ca-bundle.h +prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h $(OBJDIR)/%.o: %.c # @echo Compiling $< @@ -252,7 +252,7 @@ ifdef WITH_SSL endif clean: - -$(RM) config.h ca-bundle.h + -$(RM) config.h -$(RM) -r $(OBJDIR) distclean: clean @@ -523,25 +523,11 @@ endif FORCE: ; -ca-bundle.h: FORCE Makefile.netware - @echo Creating $@ - @echo $(DL)/* Do not edit this file - it is created by make!$(DL) > $@ - @echo $(DL)** All your changes will be lost!!$(DL) >> $@ - @echo $(DL)*/$(DL) >> $@ -ifdef CABUNDLE - @echo $(DL)#define CURL_CA_BUNDLE "$(CABUNDLE)"$(DL) >> $@ -else - @echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@ -endif - info: $(OBJDIR)/version.inc @echo Configured to build $(TARGET) with these options: @echo libarchitecture: $(LIBARCH) @echo curl version: $(LIBCURL_VERSION_STR) @echo compiler/linker: $(CC) / $(LD) -ifdef CABUNDLE - @echo ca-bundle path: $(CABUNDLE) -endif ifdef WITH_SSL @echo SSL support: enabled (OpenSSL) else diff --git a/lib/easy.c b/lib/easy.c index 93b5095a1..145619c85 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -83,7 +83,6 @@ #include "easyif.h" #include "select.h" #include "sendf.h" /* for failf function prototype */ -#include <ca-bundle.h> #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -137,7 +137,6 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by #include "inet_ntop.h" #include "http_ntlm.h" #include "socks.h" -#include <ca-bundle.h> #if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL) #include "inet_ntoa_r.h" diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh index cd1db3ed3..b066c282c 100644 --- a/packages/OS400/make-lib.sh +++ b/packages/OS400/make-lib.sh @@ -9,21 +9,6 @@ SCRIPTDIR=`dirname "${0}"` cd "${TOPDIR}/lib" -# Create ca-bundle.h file. - -if action_needed "ca-bundle.h" -then echo "/* This file is generated automatically */" > ca-bundle.h - echo "#ifndef CURL_CA_BUNDLE" >> ca-bundle.h - - if [ "${CABUNDLE}" ] - then echo '#define CURL_CA_BUNDLE @CURL_CA_BUNDLE@' >> ca-bundle.h - else echo '#undef CURL_CA_BUNDLE /* unknown */' >> ca-bundle.h - fi - - echo "#endif" >> ca-bundle.h -fi - - # Create and compile the identification source file. echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c |