diff options
| author | Guenter Knauf <lists@gknw.net> | 2012-05-27 07:26:48 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2012-05-27 07:26:48 +0200 |
| commit | f95f19e85495572541134ecaf3f39369f1e4e1cd (patch) | |
| tree | 8217d048287ca5311ab4fc1eac725c5eaecdcb27 /docs/examples | |
| parent | ca8b4e9742ca640b91024d65d4c0d10a58674d8b (diff) | |
Enabled OpenSSL static linkage.
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/Makefile.m32 | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index 4327a64f8..3387c9283 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -40,12 +40,6 @@ endif ifndef OPENSSL_PATH OPENSSL_PATH = ../../../openssl-0.9.8x endif -ifndef OPENSSL_LIBPATH -OPENSSL_LIBPATH = $(OPENSSL_PATH)/out -endif -ifndef OPENSSL_LIBS -OPENSSL_LIBS = -leay32 -lssl32 -endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH LIBSSH2_PATH = ../../../libssh2-1.4.2 @@ -148,6 +142,7 @@ else curl_DEPENDENCIES = $(PROOT)/lib/libcurl.a curl_LDADD = -L$(PROOT)/lib -lcurl CFLAGS += -DCURL_STATICLIB + LDFLAGS += -static endif ifdef ARES ifndef DYN @@ -165,7 +160,22 @@ ifdef SSH2 curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2 endif ifdef SSL - CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H + ifndef OPENSSL_LIBPATH + OPENSSL_LIBS = -lssl -lcrypto + ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out" + OPENSSL_LIBPATH = $(OPENSSL_PATH)/out + ifdef DYN + OPENSSL_LIBS = -lssl32 -leay32 + endif + endif + ifeq "$(wildcard $(OPENSSL_PATH)/lib)" "$(OPENSSL_PATH)/lib" + OPENSSL_LIBPATH = $(OPENSSL_PATH)/lib + endif + endif + ifndef DYN + OPENSSL_LIBS += -lgdi32 -lcrypt32 + endif + CFLAGS += -DUSE_SSLEAY curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) endif ifdef ZLIB |