Commit 909fdc07 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

make folks use latest available dependent libraries.

parent 8c6793d7

lib/Makefile.m32

+13 −10
Original line number Original line Diff line number Diff line
@@ -16,26 +16,29 @@ 




# Edit the path below to point to the base of your Zlib sources.

# Edit the path below to point to the base of your Zlib sources.

ifndef ZLIB_PATH

ifndef ZLIB_PATH

ZLIB_PATH = ../../zlib-1.2.3

ZLIB_PATH = ../../zlib-1.2.4

endif

endif

# Edit the path below to point to the base of your OpenSSL package.

# Edit the path below to point to the base of your OpenSSL package.

ifndef OPENSSL_PATH

ifndef OPENSSL_PATH

OPENSSL_PATH = ../../openssl-0.9.8k

OPENSSL_PATH = ../../openssl-0.9.8n

endif

endif

# Edit the path below to point to the base of your LibSSH2 package.

# Edit the path below to point to the base of your LibSSH2 package.

ifndef LIBSSH2_PATH

ifndef LIBSSH2_PATH

LIBSSH2_PATH = ../../libssh2-1.1

LIBSSH2_PATH = ../../libssh2-1.2.4

endif

endif

# Edit the path below to point to the base of your libidn package.

# Edit the path below to point to the base of your libidn package.

ifndef LIBIDN_PATH

ifndef LIBIDN_PATH

LIBIDN_PATH = ../../libidn-1.13

LIBIDN_PATH = ../../libidn-1.18

endif

endif

# Edit the path below to point to the base of your Novell LDAP NDK.

# Edit the path below to point to the base of your Novell LDAP NDK.

ifndef LDAP_SDK

ifndef LDAP_SDK

LDAP_SDK = c:/novell/ndk/cldapsdk/win32

LDAP_SDK = c:/novell/ndk/cldapsdk/win32

endif

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

CC = gcc

AR = ar

AR = ar
@@ -53,10 +56,10 @@ STRIP = strip -g 
INCLUDES = -I. -I../include

INCLUDES = -I. -I../include

CFLAGS = -g -O2 -DBUILDING_LIBCURL

CFLAGS = -g -O2 -DBUILDING_LIBCURL

ifdef ARES

ifdef ARES

  INCLUDES += -I$(ARES_LIB)

  INCLUDES += -I$(LIBCARES_PATH)

  CFLAGS += -DUSE_ARES

  CFLAGS += -DUSE_ARES

  DLL_LIBS += -L$(ARES_LIB) -lcares

  DLL_LIBS += -L$(LIBCARES_PATH) -lcares

  libcurl_dll_DEPENDENCIES = $(ARES_LIB)/libcares.a

  libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a

endif

endif

ifdef SSH2

ifdef SSH2

  INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"

  INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
@@ -150,7 +153,7 @@ distrib: clean 




FORCE: ;

FORCE: ;





$(ARES_LIB)/libcares.a:

$(LIBCARES_PATH)/libcares.a:

	$(MAKE) -C $(ARES_LIB) -f Makefile.m32

	$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32

lib/Makefile.netware

+14 −10
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
## Makefile for building libcurl.nlm (NetWare version - gnu make)

## Makefile for building libcurl.nlm (NetWare version - gnu make)

## Use: make -f Makefile.netware

## 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.

# Edit the path below to point to the base of your Zlib sources.

ifndef ZLIB_PATH

ifndef ZLIB_PATH

ZLIB_PATH = ../../zlib-1.2.3

ZLIB_PATH = ../../zlib-1.2.4

endif

endif





# Edit the path below to point to the base of your OpenSSL package.

# Edit the path below to point to the base of your OpenSSL package.

ifndef OPENSSL_PATH

ifndef OPENSSL_PATH

OPENSSL_PATH = ../../openssl-0.9.8k

OPENSSL_PATH = ../../openssl-0.9.8n

endif

endif





# Edit the path below to point to the base of your LibSSH2 package.

# Edit the path below to point to the base of your LibSSH2 package.

ifndef LIBSSH2_PATH

ifndef LIBSSH2_PATH

LIBSSH2_PATH = ../../libssh2-1.1

LIBSSH2_PATH = ../../libssh2-1.2.4

endif

endif





# Edit the path below to point to the base of your libidn package.

# Edit the path below to point to the base of your libidn package.

ifndef LIBIDN_PATH

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

endif





ifndef INSTDIR

ifndef INSTDIR
@@ -154,13 +159,12 @@ SDK_LIBC = $(NDK_ROOT)/libc 
SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware

SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware

CURL_INC = ../include

CURL_INC = ../include

CURL_LIB = ../lib

CURL_LIB = ../lib

ARES_LIB = ../ares





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

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





ifdef WITH_ARES

ifdef WITH_ARES

	INCLUDES += -I$(ARES_LIB)

	INCLUDES += -I$(LIBCARES_PATH)

	LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)

	LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)

endif

endif

ifdef WITH_SSH2

ifdef WITH_SSH2

	INCLUDES += -I$(LIBSSH2_PATH)/include

	INCLUDES += -I$(LIBSSH2_PATH)/include
@@ -599,8 +603,8 @@ else 
	@echo ipv6 support:    no

	@echo ipv6 support:    no

endif

endif





$(ARES_LIB)/libcares.$(LIBEXT):

$(LIBCARES_PATH)/libcares.$(LIBEXT):

	$(MAKE) -C $(ARES_LIB) -f Makefile.netware lib

	$(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib





ca-bundle.crt: mk-ca-bundle.pl

ca-bundle.crt: mk-ca-bundle.pl

	@echo Creating $@

	@echo Creating $@

src/Makefile.m32

+10 −7
Original line number Original line Diff line number Diff line
@@ -16,26 +16,29 @@ 




# Edit the path below to point to the base of your Zlib sources.

# Edit the path below to point to the base of your Zlib sources.

ifndef ZLIB_PATH

ifndef ZLIB_PATH

ZLIB_PATH = ../../zlib-1.2.3

ZLIB_PATH = ../../zlib-1.2.4

endif

endif

# Edit the path below to point to the base of your OpenSSL package.

# Edit the path below to point to the base of your OpenSSL package.

ifndef OPENSSL_PATH

ifndef OPENSSL_PATH

OPENSSL_PATH = ../../openssl-0.9.8k

OPENSSL_PATH = ../../openssl-0.9.8n

endif

endif

# Edit the path below to point to the base of your LibSSH2 package.

# Edit the path below to point to the base of your LibSSH2 package.

ifndef LIBSSH2_PATH

ifndef LIBSSH2_PATH

LIBSSH2_PATH = ../../libssh2-1.1

LIBSSH2_PATH = ../../libssh2-1.2.4

endif

endif

# Edit the path below to point to the base of your libidn package.

# Edit the path below to point to the base of your libidn package.

ifndef LIBIDN_PATH

ifndef LIBIDN_PATH

LIBIDN_PATH = ../../libidn-1.13

LIBIDN_PATH = ../../libidn-1.18

endif

endif

# Edit the path below to point to the base of your Novell LDAP NDK.

# Edit the path below to point to the base of your Novell LDAP NDK.

ifndef LDAP_SDK

ifndef LDAP_SDK

LDAP_SDK = c:/novell/ndk/cldapsdk/win32

LDAP_SDK = c:/novell/ndk/cldapsdk/win32

endif

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

CC = gcc

CFLAGS = -g -O2

CFLAGS = -g -O2
@@ -67,10 +70,10 @@ else 
endif

endif

ifdef ARES

ifdef ARES

  ifndef DYN

  ifndef DYN

    curl_DEPENDENCIES += $(ARES_LIB)/libcares.a

    curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a

  endif

  endif

  CFLAGS += -DUSE_ARES

  CFLAGS += -DUSE_ARES

  curl_LDADD += -L$(ARES_LIB) -lcares

  curl_LDADD += -L$(LIBCARES_PATH) -lcares

endif

endif

ifdef SSH2

ifdef SSH2

  CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H

  CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H

src/Makefile.netware

+13 −9
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
## Makefile for building curl.nlm (NetWare version - gnu make)

## Makefile for building curl.nlm (NetWare version - gnu make)

## Use: make -f Makefile.netware

## 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.

# Edit the path below to point to the base of your Zlib sources.

ifndef ZLIB_PATH

ifndef ZLIB_PATH

ZLIB_PATH = ../../zlib-1.2.3

ZLIB_PATH = ../../zlib-1.2.4

endif

endif





# Edit the path below to point to the base of your OpenSSL package.

# Edit the path below to point to the base of your OpenSSL package.

ifndef OPENSSL_PATH

ifndef OPENSSL_PATH

OPENSSL_PATH = ../../openssl-0.9.8k

OPENSSL_PATH = ../../openssl-0.9.8n

endif

endif





# Edit the path below to point to the base of your LibSSH2 package.

# Edit the path below to point to the base of your LibSSH2 package.

ifndef LIBSSH2_PATH

ifndef LIBSSH2_PATH

LIBSSH2_PATH = ../../libssh2-1.1

LIBSSH2_PATH = ../../libssh2-1.2.4

endif

endif





# Edit the path below to point to the base of your libidn package.

# Edit the path below to point to the base of your libidn package.

ifndef LIBIDN_PATH

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

endif





ifndef INSTDIR

ifndef INSTDIR
@@ -148,14 +153,13 @@ SDK_LIBC = $(NDK_ROOT)/libc 
SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware

SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware

CURL_INC = ../include

CURL_INC = ../include

CURL_LIB = ../lib

CURL_LIB = ../lib

ARES_LIB = ../ares





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

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





ifdef LINK_STATIC

ifdef LINK_STATIC

	LDLIBS	= $(CURL_LIB)/libcurl.$(LIBEXT)

	LDLIBS	= $(CURL_LIB)/libcurl.$(LIBEXT)

ifdef WITH_ARES

ifdef WITH_ARES

	LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)

	LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)

endif

endif

else

else

	MODULES	= libcurl.nlm

	MODULES	= libcurl.nlm
@@ -555,7 +559,7 @@ hugehelp.c: 
	@echo Creating $@

	@echo Creating $@

	@$(CP) hugehelp.c.cvs $@

	@$(CP) hugehelp.c.cvs $@





$(ARES_LIB)/libcares.$(LIBEXT):

$(LIBCARES_PATH)/libcares.$(LIBEXT):

	$(MAKE) -C $(ARES_LIB) -f Makefile.netware lib

	$(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib