make folks use latest available dependent libraries. (909fdc07) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.m32

+13 −10

Original line number	Diff line number	Diff line
		@@ -16,26 +16,29 @@

		# Edit the path below to point to the base of your Zlib sources.
		ifndef ZLIB_PATH
		ZLIB_PATH = ../../zlib-1.2.3
		ZLIB_PATH = ../../zlib-1.2.4
		endif
		# Edit the path below to point to the base of your OpenSSL package.
		ifndef OPENSSL_PATH
		OPENSSL_PATH = ../../openssl-0.9.8k
		OPENSSL_PATH = ../../openssl-0.9.8n
		endif
		# Edit the path below to point to the base of your LibSSH2 package.
		ifndef LIBSSH2_PATH
		LIBSSH2_PATH = ../../libssh2-1.1
		LIBSSH2_PATH = ../../libssh2-1.2.4
		endif
		# Edit the path below to point to the base of your libidn package.
		ifndef LIBIDN_PATH
		LIBIDN_PATH = ../../libidn-1.13
		LIBIDN_PATH = ../../libidn-1.18
		endif
		# Edit the path below to point to the base of your Novell LDAP NDK.
		ifndef LDAP_SDK
		LDAP_SDK = c:/novell/ndk/cldapsdk/win32
		endif

		ARES_LIB = ../ares
		# Edit the path below to point to the base of your c-ares package.
		ifndef LIBCARES_PATH
		LIBCARES_PATH = ../ares
		endif

		CC = gcc
		AR = ar
		@@ -53,10 +56,10 @@ STRIP = strip -g
		INCLUDES = -I. -I../include
		CFLAGS = -g -O2 -DBUILDING_LIBCURL
		ifdef ARES
		INCLUDES += -I$(ARES_LIB)
		INCLUDES += -I$(LIBCARES_PATH)
		CFLAGS += -DUSE_ARES
		DLL_LIBS += -L$(ARES_LIB) -lcares
		libcurl_dll_DEPENDENCIES = $(ARES_LIB)/libcares.a
		DLL_LIBS += -L$(LIBCARES_PATH) -lcares
		libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
		endif
		ifdef SSH2
		INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
		@@ -150,7 +153,7 @@ distrib: clean

		FORCE: ;

		$(ARES_LIB)/libcares.a:
		$(MAKE) -C $(ARES_LIB) -f Makefile.m32
		$(LIBCARES_PATH)/libcares.a:
		$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32

lib/Makefile.netware

+14 −10

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		## Makefile for building libcurl.nlm (NetWare version - gnu make)
		## Use: make -f Makefile.netware
		##
		## Comments to: Guenter Knauf http://www.gknw.de/phpbb
		## Comments to: Guenter Knauf http://www.gknw.net/phpbb
		#
		#################################################################

		@@ -14,22 +14,27 @@ endif

		# Edit the path below to point to the base of your Zlib sources.
		ifndef ZLIB_PATH
		ZLIB_PATH = ../../zlib-1.2.3
		ZLIB_PATH = ../../zlib-1.2.4
		endif

		# Edit the path below to point to the base of your OpenSSL package.
		ifndef OPENSSL_PATH
		OPENSSL_PATH = ../../openssl-0.9.8k
		OPENSSL_PATH = ../../openssl-0.9.8n
		endif

		# Edit the path below to point to the base of your LibSSH2 package.
		ifndef LIBSSH2_PATH
		LIBSSH2_PATH = ../../libssh2-1.1
		LIBSSH2_PATH = ../../libssh2-1.2.4
		endif

		# Edit the path below to point to the base of your libidn package.
		ifndef LIBIDN_PATH
		LIBIDN_PATH = ../../libidn-1.13
		LIBIDN_PATH = ../../libidn-1.18
		endif

		# Edit the path below to point to the base of your c-ares package.
		ifndef LIBCARES_PATH
		LIBCARES_PATH = ../ares
		endif

		ifndef INSTDIR
		@@ -154,13 +159,12 @@ SDK_LIBC = $(NDK_ROOT)/libc
		SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
		CURL_INC = ../include
		CURL_LIB = ../lib
		ARES_LIB = ../ares

		INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)

		ifdef WITH_ARES
		INCLUDES += -I$(ARES_LIB)
		LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)
		INCLUDES += -I$(LIBCARES_PATH)
		LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
		endif
		ifdef WITH_SSH2
		INCLUDES += -I$(LIBSSH2_PATH)/include
		@@ -599,8 +603,8 @@ else
		@echo ipv6 support: no
		endif

		$(ARES_LIB)/libcares.$(LIBEXT):
		$(MAKE) -C $(ARES_LIB) -f Makefile.netware lib
		$(LIBCARES_PATH)/libcares.$(LIBEXT):
		$(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib

		ca-bundle.crt: mk-ca-bundle.pl
		@echo Creating $@

src/Makefile.m32

+10 −7

Original line number	Diff line number	Diff line
		@@ -16,26 +16,29 @@

		# Edit the path below to point to the base of your Zlib sources.
		ifndef ZLIB_PATH
		ZLIB_PATH = ../../zlib-1.2.3
		ZLIB_PATH = ../../zlib-1.2.4
		endif
		# Edit the path below to point to the base of your OpenSSL package.
		ifndef OPENSSL_PATH
		OPENSSL_PATH = ../../openssl-0.9.8k
		OPENSSL_PATH = ../../openssl-0.9.8n
		endif
		# Edit the path below to point to the base of your LibSSH2 package.
		ifndef LIBSSH2_PATH
		LIBSSH2_PATH = ../../libssh2-1.1
		LIBSSH2_PATH = ../../libssh2-1.2.4
		endif
		# Edit the path below to point to the base of your libidn package.
		ifndef LIBIDN_PATH
		LIBIDN_PATH = ../../libidn-1.13
		LIBIDN_PATH = ../../libidn-1.18
		endif
		# Edit the path below to point to the base of your Novell LDAP NDK.
		ifndef LDAP_SDK
		LDAP_SDK = c:/novell/ndk/cldapsdk/win32
		endif

		ARES_LIB = ../ares
		# Edit the path below to point to the base of your c-ares package.
		ifndef LIBCARES_PATH
		LIBCARES_PATH = ../ares
		endif

		CC = gcc
		CFLAGS = -g -O2
		@@ -67,10 +70,10 @@ else
		endif
		ifdef ARES
		ifndef DYN
		curl_DEPENDENCIES += $(ARES_LIB)/libcares.a
		curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
		endif
		CFLAGS += -DUSE_ARES
		curl_LDADD += -L$(ARES_LIB) -lcares
		curl_LDADD += -L$(LIBCARES_PATH) -lcares
		endif
		ifdef SSH2
		CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H

src/Makefile.netware

+13 −9

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		## Makefile for building curl.nlm (NetWare version - gnu make)
		## Use: make -f Makefile.netware
		##
		## Comments to: Guenter Knauf http://www.gknw.de/phpbb
		## Comments to: Guenter Knauf http://www.gknw.net/phpbb
		#
		#################################################################

		@@ -14,22 +14,27 @@ endif

		# Edit the path below to point to the base of your Zlib sources.
		ifndef ZLIB_PATH
		ZLIB_PATH = ../../zlib-1.2.3
		ZLIB_PATH = ../../zlib-1.2.4
		endif

		# Edit the path below to point to the base of your OpenSSL package.
		ifndef OPENSSL_PATH
		OPENSSL_PATH = ../../openssl-0.9.8k
		OPENSSL_PATH = ../../openssl-0.9.8n
		endif

		# Edit the path below to point to the base of your LibSSH2 package.
		ifndef LIBSSH2_PATH
		LIBSSH2_PATH = ../../libssh2-1.1
		LIBSSH2_PATH = ../../libssh2-1.2.4
		endif

		# Edit the path below to point to the base of your libidn package.
		ifndef LIBIDN_PATH
		LIBIDN_PATH = ../../libidn-1.13
		LIBIDN_PATH = ../../libidn-1.18
		endif

		# Edit the path below to point to the base of your c-ares package.
		ifndef LIBARES_PATH
		LIBARES_PATH = ../ares
		endif

		ifndef INSTDIR
		@@ -148,14 +153,13 @@ SDK_LIBC = $(NDK_ROOT)/libc
		SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
		CURL_INC = ../include
		CURL_LIB = ../lib
		ARES_LIB = ../ares

		INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)

		ifdef LINK_STATIC
		LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT)
		ifdef WITH_ARES
		LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)
		LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
		endif
		else
		MODULES = libcurl.nlm
		@@ -555,7 +559,7 @@ hugehelp.c:
		@echo Creating $@
		@$(CP) hugehelp.c.cvs $@

		$(ARES_LIB)/libcares.$(LIBEXT):
		$(MAKE) -C $(ARES_LIB) -f Makefile.netware lib
		$(LIBCARES_PATH)/libcares.$(LIBEXT):
		$(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib

Admin message