diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-01-29 00:51:02 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-01-29 00:51:02 +0000 |
| commit | ddace02efe44a4021d75f62cc30816d4f1a30776 (patch) | |
| tree | c92d8a713a058724d03513e358f3a95bee90a60f /lib | |
| parent | 1f4c8c4f0931ceb1afc11e6d5310d4d8e953b0a8 (diff) | |
fixed segfault when compiled with MingW32 and cmd or command shell.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.m32 | 2 | ||||
| -rw-r--r-- | lib/setup.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 3e1a07680..17085cdc1 100644 --- 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 6bcde3d5c..84acfcafd 100644 --- 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. */ |