From e0af4a15d0ebeded2de2d3f28a26c8212c873ded Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 11 Nov 2008 19:42:35 +0000 Subject: [PATCH] added libidn build. --- lib/Makefile.netware | 12 ++++++++++++ src/Makefile.netware | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 2f4ee7b61..867980952 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -28,6 +28,11 @@ ifndef LIBSSH2_PATH LIBSSH2_PATH = ../../libssh2-0.18 endif +# Edit the path below to point to the base of your libidn package. +ifndef LIBIDN_PATH +LIBIDN_PATH = ../../libidn-1.9 +endif + ifndef INSTDIR INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw endif @@ -183,6 +188,10 @@ else IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp endif endif +ifdef WITH_IDN + INCLUDES += -I$(LIBIDN_PATH)/include + LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT) +endif ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include @@ -536,6 +545,9 @@ endif ifdef WITH_SSH2 @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@ +endif +ifdef WITH_IDN + @echo $(DL)#define USE_LIBIDN 1$(DL) >> $@ endif @echo $(DL)#ifdef __GNUC__$(DL) >> $@ @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@ diff --git a/src/Makefile.netware b/src/Makefile.netware index 7e02432c7..d5aa9a8ae 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -28,6 +28,11 @@ ifndef LIBSSH2_PATH LIBSSH2_PATH = ../../libssh2-0.18 endif +# Edit the path below to point to the base of your libidn package. +ifndef LIBIDN_PATH +LIBIDN_PATH = ../../libidn-1.9 +endif + ifndef INSTDIR INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw endif @@ -181,6 +186,10 @@ else IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp endif endif +ifdef WITH_IDN + # INCLUDES += -I$(LIBIDN_PATH)/include + LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT) +endif ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include @@ -524,6 +533,9 @@ endif ifdef WITH_SSH2 @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@ +endif +ifdef WITH_IDN + @echo $(DL)#define USE_LIBIDN 1$(DL) >> $@ endif @echo $(DL)#ifdef __GNUC__$(DL) >> $@ @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@