[6375] more XS build fixes

[Gavin D. Smith]

Revision: 6375
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6375
Author:   gavin
Date:     2015-07-02 20:21:23 +0000 (Thu, 02 Jul 2015)
Log Message:
-----------
more XS build fixes

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
    trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm
    trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-02 17:26:49 UTC (rev 6374)
+++ trunk/ChangeLog     2015-07-02 20:21:23 UTC (rev 6375)
@@ -1,5 +1,15 @@
 2015-07-02  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/configure.ac 
+       (lookup_perl_flags): Strip any compiler flags that
+       aren't -I or -D.
+       * tp/Texinfo/Convert/XSParagraph/mylib/xspara.c (hello): Try a
+       "en_US.UTF-8" locale.
+       * tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm: Reduce 
+       required Perl version.
+
+2015-07-02  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm: Rewritten 
        to use DynaLoader module, instead of XSLoader.  Look for a 
        Libtool *.la file and extract the name of the loadable object 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-07-02 17:26:49 UTC 
(rev 6374)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-07-02 20:21:23 UTC 
(rev 6375)
@@ -3,13 +3,30 @@
 LT_INIT
 AC_CONFIG_MACRO_DIR([m4])
 
+AC_PROG_CC
+
 AC_DEFUN([lookup_perl_conf],
          [echo Getting Perl conf value $1
           AC_SUBST([PERL_CONF_$1], [`./fetch_conf.pl $1`])
          ])
-AC_PROG_CC
-lookup_perl_conf([ccflags])
-lookup_perl_conf([cccdlflags])
+
+AC_DEFUN([lookup_perl_flags],
+         [echo Getting Perl flags for $1
+
+          conf_value=`./fetch_conf.pl $1`
+          echo conf value is $conf_value
+
+          # Remove any flags that aren't -I or -D
+          conf_value=`echo $conf_value | sed -e 's/-@<:@^ID@:>@@<:@^ @:>@*//g'`
+          echo cleaned is $conf_value
+
+          AC_SUBST([PERL_CONF_$1], [$conf_value])
+         ])
+
+
+lookup_perl_flags([ccflags])
+lookup_perl_flags([cccdlflags])
+
 lookup_perl_conf([archlibexp])
 # TODO: would be nice to be able to do lookup_perl_conf([ccflags cccdlflags])
 # A for loop doesn't work; it has to be expanded at m4 time
@@ -17,6 +34,5 @@
 AC_PATH_PROG([PERL], [perl])
 AC_PATH_PROG([XSUBPP], [xsubpp])
 
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm     2015-07-02 
17:26:49 UTC (rev 6374)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm     2015-07-02 
20:21:23 UTC (rev 6375)
@@ -5,7 +5,9 @@
 
 use DynaLoader;
 
-use 5.018001;
+# same as texi2any.pl, although I don't know what the real requirement
+# is for this module.
+use 5.00405;
 use strict;
 use warnings;
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-02 17:26:49 UTC 
(rev 6374)
+++ trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-02 20:21:23 UTC 
(rev 6375)
@@ -73,7 +73,8 @@
 xspara_hello (void)
 {
   puts ("hello world");
-  if (!setlocale (LC_CTYPE, "en_US.utf8"))
+  if (!setlocale (LC_CTYPE, "en_US.UTF-8")
+      && !setlocale (LC_CTYPE, "en_US.utf8"))
     {
       fprintf (stderr, "Couldn't set UTF-8 character type in locale.\n");
       abort ();