romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 10:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

make folks use latest available dependent libraries.

Browse source
This commit is contained in:
Guenter Knauf 2010-03-31 01:10:09 +02:00
parent 8c6793d79a
commit 909fdc07bf
4 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Makefile.m32
View file

@ -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

22
src/Makefile.netware
View file

@ -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