diff options
| author | Gunter Knauf <gk@gknw.de> | 2005-08-10 19:19:25 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2005-08-10 19:19:25 +0000 |
| commit | 0ae6ff9f721f4f1363cb548b348faba5179c7617 (patch) | |
| tree | 21c736d27d785306045003e4e4b4668ab2698229 | |
| parent | 8b571fbbb1b36f94a6b4279fb52a9e956a86040b (diff) | |
some minor Makefile fixes for SSL.
| -rw-r--r-- | lib/Makefile.netware | 28 | ||||
| -rw-r--r-- | src/Makefile.netware | 14 |
2 files changed, 27 insertions, 15 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index a75940872..7bfd2e4da 100644 --- a/lib/Makefile.netware +++ b/lib/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 @@ -116,19 +118,20 @@ ifdef WITH_ARES INCLUDES += -I../ares LIBCARES = ../ares/libcares.lib endif -ifdef ZLIB_PATH +ifdef WITH_ZLIB INCLUDES += -I$(ZLIB_PATH) - IMPORTS = @$(ZLIB_PATH)/nw/zlib.imp + IMPORTS = @$(ZLIB_PATH)/nw/libz.imp MODULES = libz.nlm endif -ifdef SSL +ifdef WITH_SSL INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_libc -I$(OPENSSL_PATH)/outinc_nw_libc/openssl LIBSSL = $(OPENSSL_PATH)/out_nw_libc/crypto.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib + IMPORTS += GetProcessSwitchCount RunningProcess 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__ @@ -277,7 +280,7 @@ ifeq ($(LD),nlmconv) ifdef WITH_ARES @echo $(DL)input $(LIBCARES)$(DL) >> $@ endif -ifdef SSL +ifdef WITH_SSL @echo $(DL)input $(LIBSSL)$(DL) >> $@ endif @echo $(DL)input $(OBJL)$(DL) >> $@ @@ -336,6 +339,13 @@ config.h: Makefile.netware @echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@ @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@ @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ + @echo $(DL)#define HAVE_AF_INET6 1$(DL) >> $@ + @echo $(DL)#define HAVE_PF_INET6 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_IN6_ADDR 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@ + @echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@ + @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@ ifdef DISABLE_LDAP @echo $(DL)#define CURL_DISABLE_LDAP 1$(DL) >> $@ else @@ -355,11 +365,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 USE_OPENSSL 1$(DL) >> $@ @echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@ 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) >> $@ |