Commit d13be06a authored by Michal Marek's avatar Michal Marek
Browse files

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.
parent f1c69192

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -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])

buildconf.bat

+1 −4
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 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

configure.ac

+0 −3
Original line number Diff line number Diff line
@@ -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 **********************************************************************

lib/.cvsignore

+0 −1
Original line number Diff line number Diff line
@@ -6,6 +6,5 @@ Makefile 
.libs

config.h

stamp-*

ca-bundle.h

getdate.c

curllib.dsp