fixed segfault when compiled with MingW32 and cmd or command shell.

diff --git a/buildconf.bat b/buildconf.bat
index beecb6f..7c53757 100644 (file)
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -5,10 +5,6 @@ REM $Date$
 \r
 REM create ca-bundle.h\r
 echo /* This file is generated automatically */ >lib\ca-bundle.h\r
-echo #ifndef CURL_CA_BUNDLE >>lib\ca-bundle.h
-echo #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") >>lib\ca-bundle.h
-echo #endif >>lib\ca-bundle.h
-
 \r
 REM create hugehelp.c\r
 copy src\hugehelp.c.cvs src\hugehelp.c\r

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 3e1a076..17085cd 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -39,7 +39,7 @@ ifdef SSL
   INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
   CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
             -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \
-            -DCURL_CA_BUNDLE='getenv("CURL_CA_BUNDLE")'
+            -DCURL_WANTS_CA_BUNDLE_ENV
   DLL_LIBS += -L$(OPENSSL_PATH)/out -leay32 -lssl32
 endif
 ifdef ZLIB

diff --git a/lib/setup.h b/lib/setup.h
index 6bcde3d..84acfca 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -364,6 +364,11 @@ int fileno( FILE *stream);
 #define DEBUGF(x)
 #endif
 
+/* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */
+#if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE)
+#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")
+#endif
+
 /*
  * Include macros and defines that should only be processed once.
  */