# HG changeset patch # User Michael Goffioul # Date 1372044820 14400 # Node ID fae995570da2fa1aba5daff81a806b6989a188cc # Parent 71ca96663e2c770bee4316c00010cdff7d79f2bc [MSVC] enable libidn compilation diff -r 71ca96663e2c -r fae995570da2 src/libidn.mk --- a/src/libidn.mk Sun Jun 23 23:33:40 2013 -0400 +++ b/src/libidn.mk Sun Jun 23 23:33:40 2013 -0400 @@ -23,6 +23,6 @@ $(ENABLE_SHARED_OR_STATIC) \ --disable-csharp \ --prefix='$(HOST_PREFIX)' \ - --with-libiconv-prefix='$(HOST_PREFIX)' + --with-libiconv-prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 71ca96663e2c -r fae995570da2 src/msvc-libidn-1.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/msvc-libidn-1.patch Sun Jun 23 23:33:40 2013 -0400 @@ -0,0 +1,82 @@ +diff -ur libidn-1.25-orig/examples/example.c libidn-1.25/examples/example.c +--- libidn-1.25-orig/examples/example.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example.c 2013-06-23 15:49:49 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + #include +diff -ur libidn-1.25-orig/examples/example2.c libidn-1.25/examples/example2.c +--- libidn-1.25-orig/examples/example2.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example2.c 2013-06-23 15:50:00 -0400 +@@ -19,6 +19,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include /* setlocale() */ + + /* +diff -ur libidn-1.25-orig/examples/example3.c libidn-1.25/examples/example3.c +--- libidn-1.25-orig/examples/example3.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example3.c 2013-06-23 15:50:06 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + #include +diff -ur libidn-1.25-orig/examples/example4.c libidn-1.25/examples/example4.c +--- libidn-1.25-orig/examples/example4.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example4.c 2013-06-23 15:50:12 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + #include +diff -ur libidn-1.25-orig/examples/example5.c libidn-1.25/examples/example5.c +--- libidn-1.25-orig/examples/example5.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example5.c 2013-06-23 15:50:18 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + #include +diff -ur libidn-1.25-orig/lib/Makefile.in libidn-1.25/lib/Makefile.in +--- libidn-1.25-orig/lib/Makefile.in 2012-05-23 04:36:47 -0400 ++++ libidn-1.25/lib/Makefile.in 2013-06-23 15:49:18 -0400 +@@ -1090,7 +1090,7 @@ + $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined \ + $(am__append_3) $(am__append_4) $(am__append_5) + @HAVE_LD_OUTPUT_DEF_TRUE@defexecdir = $(bindir) +-@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libidn-$(DLL_VERSION).def ++@HAVE_LD_OUTPUT_DEF_TRUE@#defexec_DATA = libidn-$(DLL_VERSION).def + @HAVE_LD_OUTPUT_DEF_TRUE@CLEANFILES = $(defexec_DATA) + SPEC = $(top_srcdir)/doc/specifications + all: $(BUILT_SOURCES)