--- origsrc/libiconv-1.14/Makefile.devel	2011-07-03 10:05:11.000000000 -0400
+++ src/libiconv-1.14/Makefile.devel	2011-10-16 12:43:48.944133600 -0400
@@ -190,8 +190,8 @@ lib/flags.h : lib/encodings.def lib/enco
 
 
 lib/translit.h : lib/translit.def lib/gentranslit.c
-	$(CC) $(CFLAGS) lib/gentranslit.c -o gentranslit
-	ulimit -s unlimited; ./gentranslit < lib/translit.def > lib/translit.h
+	$(CC) $(CFLAGS) -Wl,--stack,16777216 lib/gentranslit.c -o gentranslit
+	./gentranslit < lib/translit.def > lib/translit.h
 	$(RM) gentranslit
 
 
--- origsrc/libiconv-1.14/configure.ac	2011-08-07 13:48:03.000000000 -0400
+++ src/libiconv-1.14/configure.ac	2011-10-16 12:43:48.950133600 -0400
@@ -20,6 +20,7 @@ AC_PREREQ([2.60])
 AC_INIT
 AC_CONFIG_SRCDIR([lib/iconv.c])
 AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([libiconv], [1.14])
 AC_CONFIG_HEADERS([config.h lib/config.h])
 AC_PROG_MAKE_SET
--- origsrc/libiconv-1.14/libcharset/configure.ac	2009-10-18 11:26:59.000000000 -0400
+++ src/libiconv-1.14/libcharset/configure.ac	2011-10-16 12:43:48.958133600 -0400
@@ -23,6 +23,7 @@ VERSION=1.4
 
 AC_INIT([lib/localcharset.c])
 AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 AC_PROG_MAKE_SET
 AC_SUBST([PACKAGE])
--- origsrc/libiconv-1.14/preload/configure.ac	2009-06-21 07:17:33.000000000 -0400
+++ src/libiconv-1.14/preload/configure.ac	2011-10-16 12:43:48.964133600 -0400
@@ -23,6 +23,7 @@ VERSION=0
 
 AC_INIT([configure.ac])
 AC_CONFIG_AUX_DIR([../build-aux])
+AC_CONFIG_MACRO_DIR([../m4])
 AC_PROG_MAKE_SET
 AC_SUBST([PACKAGE])
 AC_SUBST([VERSION])
--- origsrc/libiconv-1.14/srclib/xreadlink.c	2011-08-07 09:42:07.000000000 -0400
+++ src/libiconv-1.14/srclib/xreadlink.c	2011-10-16 12:43:48.970133600 -0400
@@ -38,7 +38,9 @@ char *
 xreadlink (char const *filename)
 {
   char *result = areadlink (filename);
+#ifndef NO_XMALLOC
   if (result == NULL && errno == ENOMEM)
     xalloc_die ();
+#endif
   return result;
 }