From 87c4136bd4f67ad4dae26f1ac1ef0ff4d925cdcf Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 11 Nov 2008 17:43:02 +0000 Subject: [PATCH] added libidn build. --- lib/Makefile.m32 | 11 ++++++++++- src/Makefile.m32 | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 615d07805..6ed79bc7e 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -5,7 +5,7 @@ ## and optionally OpenSSL (0.9.8), libssh2 (0.18), zlib (1.2.3) ## ## Usage: -## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [SSPI=1] [IPV6=1] [DYN=1] +## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [DYN=1] ## ## Hint: you can also set environment vars to control the build, f.e.: ## set ZLIB_PATH=c:/zlib-1.2.3 @@ -27,6 +27,10 @@ endif 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 # Edit the path below to point to the base of your Novell LDAP NDK. ifndef LDAP_SDK LDAP_SDK = c:/novell/ndk/cldapsdk/win32 @@ -72,6 +76,11 @@ ifdef ZLIB CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H DLL_LIBS += -L$(ZLIB_PATH) -lz endif +ifdef IDN + INCLUDES += -I"$(LIBIDN_PATH)/include" + CFLAGS += -DUSE_LIBIDN + DLL_LIBS += -L$(LIBIDN_PATH)/lib -lidn +endif ifdef SSPI CFLAGS += -DUSE_WINDOWS_SSPI endif diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 3ecd99971..2f1dd9e73 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -5,7 +5,7 @@ ## and optionally OpenSSL (0.9.8), libssh2 (0.18), zlib (1.2.3) ## ## Usage: -## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [SSPI=1] [IPV6=1] [DYN=1] +## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [DYN=1] ## ## Hint: you can also set environment vars to control the build, f.e.: ## set ZLIB_PATH=c:/zlib-1.2.3 @@ -27,6 +27,10 @@ endif 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 # Edit the path below to point to the base of your Novell LDAP NDK. ifndef LDAP_SDK LDAP_SDK = c:/novell/ndk/cldapsdk/win32 @@ -82,6 +86,11 @@ ifdef ZLIB CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H curl_LDADD += -L$(ZLIB_PATH) -lz endif +ifdef IDN + INCLUDES += -I"$(LIBIDN_PATH)/include" + CFLAGS += -DUSE_LIBIDN + curl_LDADD += -L$(LIBIDN_PATH)/lib -lidn +endif ifdef SSPI CFLAGS += -DUSE_WINDOWS_SSPI endif