summaryrefslogtreecommitdiff
path: root/src/Makefile.m32
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2012-10-13 00:48:05 +0200
committerGuenter Knauf <lists@gknw.net>2012-10-13 00:48:05 +0200
commit3fc5779b919f18bbb003eaf73af30ae85ec83169 (patch)
treecd5acabb9ebb499b9b6015f9153cf5f5f275b03d /src/Makefile.m32
parentff32546d812ba02d23942e73a86fc17fed04f76e (diff)
downloadcurl-3fc5779b919f18bbb003eaf73af30ae85ec83169.tar.gz
Revert c44e674; add OpenSSL includes/defines.
The makefile is designed to build against a libmetalink devel package; therefore is does not matter what will change inside libmetalink. Add OpenSSL includes and defines for libmetalink-aware OpenSSL builds.
Diffstat (limited to 'src/Makefile.m32')
-rw-r--r--src/Makefile.m3218
1 files changed, 15 insertions, 3 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 986c82dca..8ff4aea05 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -180,6 +180,17 @@ ifdef SSH2
curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2
endif
ifdef SSL
+ ifndef OPENSSL_INCLUDE
+ ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
+ OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
+ endif
+ ifeq "$(wildcard $(OPENSSL_PATH)/include)" "$(OPENSSL_PATH)/include"
+ OPENSSL_INCLUDE = $(OPENSSL_PATH)/include
+ endif
+ endif
+ ifneq "$(wildcard $(OPENSSL_INCLUDE)/openssl/opensslv.h)" "$(OPENSSL_INCLUDE)/openssl/opensslv.h"
+ $(error Invalid path to OpenSSL package: $(OPENSSL_PATH))
+ endif
ifndef OPENSSL_LIBPATH
OPENSSL_LIBS = -lssl -lcrypto
ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out"
@@ -195,7 +206,8 @@ ifdef SSL
ifndef DYN
OPENSSL_LIBS += -lgdi32 -lcrypt32
endif
- CFLAGS += -DUSE_SSLEAY
+ INCLUDES += -I"$(OPENSSL_INCLUDE)"
+ CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
ifdef ZLIB
@@ -213,9 +225,9 @@ ifdef WINIDN
endif
endif
ifdef METALINK
- INCLUDES += -I"$(LIBMETALINK_PATH)/lib/includes"
+ INCLUDES += -I"$(LIBMETALINK_PATH)/include"
CFLAGS += -DUSE_METALINK
- curl_LDADD += -L"$(LIBMETALINK_PATH)/lib/.libs" -lmetalink.dll
+ curl_LDADD += -L"$(LIBMETALINK_PATH)/lib" -lmetalink
endif
ifdef SSPI
CFLAGS += -DUSE_WINDOWS_SSPI