diff options
| author | Guenter Knauf <lists@gknw.net> | 2012-05-27 03:28:43 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2012-05-27 03:28:43 +0200 |
| commit | cd4cf989bbe62ef9616943a5ab062e846367b5c4 (patch) | |
| tree | 9589c5e725c29d4c2363f795f0db5507404f58d4 /src | |
| parent | 6015b71c4e3ef4dbb79839939490215b7e8b8ead (diff) | |
Try to detect OpenSSL build type automatically.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.m32 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32 index cd3611f53..57793b7e1 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -20,12 +20,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 @@ -149,6 +143,16 @@ ifdef SSH2 curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2 endif ifdef SSL + ifndef OPENSSL_LIBPATH + ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out" + OPENSSL_LIBPATH = $(OPENSSL_PATH)/out + OPENSSL_LIBS = -leay32 -lssl32 + 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 curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) endif |