[6576] * tp/Texinfo/Convert/XSParagraph/configure.ac ( AC_CONFIG_HEADERS),

[Patrice Dumas]

Revision: 6576
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6576
Author:   pertusus
Date:     2015-08-25 21:28:50 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
        * tp/Texinfo/Convert/XSParagraph/configure.ac (AC_CONFIG_HEADERS),
        tp/Texinfo/Convert/XSParagraph/XSParagraph.xs,
        tp/Texinfo/Convert/XSParagraph/text.c,
        tp/Texinfo/Convert/XSParagraph/xspara.c:
        revert to using config.h, as gnulib requires the header file
        to be called config.h.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs
    trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
    trunk/tp/Texinfo/Convert/XSParagraph/text.c
    trunk/tp/Texinfo/Convert/XSParagraph/xspara.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-25 20:49:10 UTC (rev 6575)
+++ trunk/ChangeLog     2015-08-25 21:28:50 UTC (rev 6576)
@@ -3,6 +3,15 @@
        * tp/Texinfo/Convert/XSParagraph/configure.ac (AC_CONFIG_HEADERS),
        tp/Texinfo/Convert/XSParagraph/XSParagraph.xs,
        tp/Texinfo/Convert/XSParagraph/text.c,
+       tp/Texinfo/Convert/XSParagraph/xspara.c:
+       revert to using config.h, as gnulib requires the header file
+       to be called config.h.
+
+2015-08-25  Patrice Dumas  <address@hidden>
+
+       * tp/Texinfo/Convert/XSParagraph/configure.ac (AC_CONFIG_HEADERS),
+       tp/Texinfo/Convert/XSParagraph/XSParagraph.xs,
+       tp/Texinfo/Convert/XSParagraph/text.c,
        tp/Texinfo/Convert/XSParagraph/xspara.c: 
        Use xsparagraph_acconfig.h instead of config.h as the name for the
        header file generated by configure as an additional security against 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs 2015-08-25 20:49:10 UTC 
(rev 6575)
+++ trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs 2015-08-25 21:28:50 UTC 
(rev 6576)
@@ -1,6 +1,5 @@
 #ifdef HAVE_CONFIG_H
-  /* configure generated header file */
-  #include <xsparagraph_acconfig.h>
+  #include <config.h>
 #endif
 
 #define PERL_NO_GET_CONTEXT

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-08-25 20:49:10 UTC 
(rev 6575)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-08-25 21:28:50 UTC 
(rev 6576)
@@ -102,12 +102,7 @@
 
 AC_PATH_PROG([XSUBPP], [xsubpp])
 
-# we do not use config.h because there is already a config.h file in 
-# perl includes directory.  The header file in the build directory
-# should always be generated, so in principle there is no possibility
-# of including the one in perl directory.  Using another file name is
-# an extra security.
-AC_CONFIG_HEADERS([xsparagraph_acconfig.h:config.in])
+AC_CONFIG_HEADERS([config.h:config.in])
 
 fi # not disable_xs
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/text.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/text.c 2015-08-25 20:49:10 UTC (rev 
6575)
+++ trunk/tp/Texinfo/Convert/XSParagraph/text.c 2015-08-25 21:28:50 UTC (rev 
6576)
@@ -2,8 +2,7 @@
 
 #define _GNU_SOURCE
 #ifdef HAVE_CONFIG_H
-  /* configure generated header file */
-  #include <xsparagraph_acconfig.h>
+  #include <config.h>
 #endif
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/tp/Texinfo/Convert/XSParagraph/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2015-08-25 20:49:10 UTC 
(rev 6575)
+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2015-08-25 21:28:50 UTC 
(rev 6576)
@@ -3,8 +3,7 @@
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
-  /* configure generated header file */
-  #include <xsparagraph_acconfig.h>
+  #include <config.h>
 #endif
 #include <stdlib.h>
 #include <stdio.h>