Index: configure
--- configure.orig	2017-01-02 00:02:55.000000000 +0100
+++ configure	2017-02-03 21:40:16.614954000 +0100
@@ -4954,10 +4954,7 @@
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+    :
 fi
 
 ac_ext=c
Index: libcharset/configure
--- libcharset/configure.orig	2017-01-02 00:03:38.000000000 +0100
+++ libcharset/configure	2017-02-03 21:40:16.616948000 +0100
@@ -3148,10 +3148,7 @@
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+    :
 fi
 
 ac_ext=c
Index: src/Makefile.in
--- src/Makefile.in.orig	2016-12-04 18:12:21.000000000 +0100
+++ src/Makefile.in	2017-02-03 21:40:16.617170000 +0100
@@ -111,11 +111,7 @@
 # ../lib/libiconv.la entirely.
 install : all force
 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
-	case "@host_os@" in \
-	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
-	esac
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv_no_i18n$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
 
 install-strip : force
 	case '$(INSTALL_PROGRAM)' in \
Index: srclib/stdio.in.h
--- srclib/stdio.in.h.orig	2017-01-02 00:02:22.000000000 +0100
+++ srclib/stdio.in.h	2017-02-03 21:41:32.897475000 +0100
@@ -744,7 +744,6 @@
    removed it.  */
 #undef gets
 #if HAVE_RAW_DECL_GETS && !defined __cplusplus
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 #endif
 
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@