diff options
| -rw-r--r-- | lib/Makefile.Watcom | 2 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 3 | ||||
| -rw-r--r-- | lib/curl_setup.h | 5 |
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 2130c276b..77e5a6e0a 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -81,7 +81,7 @@ RD = rmdir /q /s 2>NUL SYS_INCL = -I"$(%watcom)/h/nt" -I"$(%watcom)/h" CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm & - -wcd=201 -bt=nt -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV & + -wcd=201 -bt=nt -d+ -dWIN32 & -dBUILDING_LIBCURL -I. -I"../include" $(SYS_INCL) !ifdef %debug diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 8895dfd8a..93bc18824 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -250,8 +250,7 @@ ifdef SSL endif INCLUDES += -I"$(OPENSSL_INCLUDE)" CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \ - -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \ - -DCURL_WANTS_CA_BUNDLE_ENV + -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) ifdef SRP ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h" diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 6391dd6c8..369b953d2 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -640,11 +640,6 @@ int netware_init(void); #endif #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 - /* * Provide a mechanism to silence picky compilers, such as gcc 4.6+. * Parameters should of course normally not be unused, but for example when |