[8086] parsetexi check HAVE_ICONV from gnulib

[gavinsmith0123]

Revision: 8086
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8086
Author:   gavin
Date:     2018-08-15 15:20:42 -0400 (Wed, 15 Aug 2018)
Log Message:
-----------
parsetexi check HAVE_ICONV from gnulib

Modified Paths:
--------------
    trunk/tp/Texinfo/XS/parsetexi/Makefile.am
    trunk/tp/Texinfo/XS/parsetexi/input.c

Modified: trunk/tp/Texinfo/XS/parsetexi/Makefile.am
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/Makefile.am   2018-08-15 19:19:59 UTC (rev 
8085)
+++ trunk/tp/Texinfo/XS/parsetexi/Makefile.am   2018-08-15 19:20:42 UTC (rev 
8086)
@@ -72,7 +72,10 @@
                  counter.c counter.h
 
 Parsetexi_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la
+Parsetexi_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBICONV)
+
 AM_CPPFLAGS =                    \
+  -I$(top_srcdir)                \
   -I$(top_srcdir)/gnulib/lib     \
   -I$(top_builddir)/gnulib/lib
 

Modified: trunk/tp/Texinfo/XS/parsetexi/input.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/input.c       2018-08-15 19:19:59 UTC (rev 
8085)
+++ trunk/tp/Texinfo/XS/parsetexi/input.c       2018-08-15 19:20:42 UTC (rev 
8086)
@@ -1,4 +1,4 @@
-/* Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
+/* Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,10 +16,14 @@
 
 #define _GNU_SOURCE
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <iconv.h>
+#if HAVE_ICONV
+# include <iconv.h>
+#endif
 #include <errno.h>
 #include <sys/stat.h>