aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2012-05-27 07:16:45 +0200
committerGuenter Knauf <lists@gknw.net>2012-05-27 07:16:45 +0200
commitca8b4e9742ca640b91024d65d4c0d10a58674d8b (patch)
tree24ec0f3949c9bb36f16f464112a5f52434eb183d /src
parentcd4cf989bbe62ef9616943a5ab062e846367b5c4 (diff)
Enabled OpenSSL static linkage.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.m3212
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 57793b7e1..decfaa2ba 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -126,6 +126,7 @@ else
curl_DEPENDENCIES = $(PROOT)/lib/libcurl.a
curl_LDADD = -L$(PROOT)/lib -lcurl
CFLAGS += -DCURL_STATICLIB
+ LDFLAGS += -static
endif
ifdef ARES
ifndef DYN
@@ -144,16 +145,21 @@ ifdef SSH2
endif
ifdef SSL
ifndef OPENSSL_LIBPATH
+ OPENSSL_LIBS = -lssl -lcrypto
ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out"
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
- OPENSSL_LIBS = -leay32 -lssl32
+ ifdef DYN
+ OPENSSL_LIBS = -lssl32 -leay32
+ endif
endif
ifeq "$(wildcard $(OPENSSL_PATH)/lib)" "$(OPENSSL_PATH)/lib"
OPENSSL_LIBPATH = $(OPENSSL_PATH)/lib
- OPENSSL_LIBS = -lcrypto -lssl
endif
endif
- CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
+ ifndef DYN
+ OPENSSL_LIBS += -lgdi32 -lcrypt32
+ endif
+ CFLAGS += -DUSE_SSLEAY
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
ifdef ZLIB