[6421] attempt at Gnulib integration for XSParagraph

[Gavin D. Smith]

Revision: 6421
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6421
Author:   gavin
Date:     2015-07-11 22:05:01 +0000 (Sat, 11 Jul 2015)
Log Message:
-----------
attempt at Gnulib integration for XSParagraph

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
    trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs
    trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-11 21:44:42 UTC (rev 6420)
+++ trunk/ChangeLog     2015-07-11 22:05:01 UTC (rev 6421)
@@ -1,5 +1,13 @@
 2015-07-11  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/XSParagraph.xs,
+       tp/Texinfo/Convert/XSParagraph/mylib/xspara.c: Add
+       an "#include <config.h>" line.
+       * tp/Texinfo/Convert/XSParagraph/configure.ac (AM_CPPFLAGS)
+       (XSParagraph_la_LIBADD): Refer to Gnulib headers and library.
+
+2015-07-11  Gavin Smith  <address@hidden>
+
        * info/Makefile.am (LDADD): Change Gnulib library file from 
        libgnu.a to libgnu.la.
        * man/Makefile.am (mi_perl5lib_path): Look for produced library 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-07-11 21:44:42 UTC 
(rev 6420)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-07-11 22:05:01 UTC 
(rev 6421)
@@ -16,6 +16,20 @@
 
 AUTOMAKE_OPTIONS=foreign subdir-objects
 
+######################## Gnulib ################################
+
+real_topsrcdir=$(top_srcdir)/../../../..
+real_topbuilddir=$(top_builddir)/../../../..
+AM_CPPFLAGS =                                   \
+  -I$(real_topsrcdir)                           \
+  -I$(real_topsrcdir)/gnulib/lib                \
+  -I$(real_topbuilddir)/gnulib/lib
+
+XSParagraph_la_LIBADD = $(real_topbuilddir)/gnulib/lib/libgnu.la \
+                       $(TERMLIBS) $(LIBINTL) $(LIBICONV)
+
+################### End Gnulib section #########################
+
 modulesdir = $(pkglibexecdir)/Texinfo
 dist_modules_DATA = lib/XSParagraph.pm
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs 2015-07-11 21:44:42 UTC 
(rev 6420)
+++ trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs 2015-07-11 22:05:01 UTC 
(rev 6421)
@@ -1,3 +1,6 @@
+#include <config.h>
+/* Gnulib needs the config.h from the top-level directory. */
+
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"

Modified: trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-11 21:44:42 UTC 
(rev 6420)
+++ trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-11 22:05:01 UTC 
(rev 6421)
@@ -2,6 +2,7 @@
 
 #define _GNU_SOURCE
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>