aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2005-08-10 19:19:25 +0000
committerGunter Knauf <gk@gknw.de>2005-08-10 19:19:25 +0000
commit0ae6ff9f721f4f1363cb548b348faba5179c7617 (patch)
tree21c736d27d785306045003e4e4b4668ab2698229 /src
parent8b571fbbb1b36f94a6b4279fb52a9e956a86040b (diff)
some minor Makefile fixes for SSL.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.netware14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile.netware b/src/Makefile.netware
index d6209816b..315bb0dbb 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -13,11 +13,13 @@ NDKBASE = c:/novell
endif
# Edit the path below to point to the base of your Zlib sources.
-#ZLIB_PATH = ../../zlib-1.2.2
+ifndef ZLIB_PATH
+ZLIB_PATH = ../../zlib-1.2.3
+endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.7g
+OPENSSL_PATH = ../../openssl-0.9.8
endif
ifndef INSTDIR
@@ -111,7 +113,7 @@ CURL_LIB = ../lib
INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
-ifdef ZLIB_PATH
+ifdef WITH_ZLIB
INCLUDES += -I$(ZLIB_PATH)
IMPORTS += @$(ZLIB_PATH)/nw/zlib.imp
MODULES += libz.nlm
@@ -119,7 +121,7 @@ endif
ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
- INCLUDES += -I$(SDK_LIBC)/include/winsock
+ # INCLUDES += -I$(SDK_LIBC)/include/winsock
# INCLUDES += -I$(SDK_LDAP)/libc/inc
CFLAGS += -D_POSIX_SOURCE
# CFLAGS += -D__ANSIC__
@@ -330,11 +332,11 @@ endif
ifdef WITH_ARES
@echo $(DL)#define USE_ARES 1$(DL) >> $@
endif
-ifdef ZLIB_PATH
+ifdef WITH_ZLIB
@echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
@echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
endif
-ifdef SSL
+ifdef WITH_SSL
@echo $(DL)#define USE_SSLEAY 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@