[6381] more XS build fixes

[Gavin D. Smith]

Revision: 6381
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6381
Author:   gavin
Date:     2015-07-03 15:51:22 +0000 (Fri, 03 Jul 2015)
Log Message:
-----------
more XS build fixes

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm
    trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c
    trunk/tp/tests/run_parser_all.sh
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-03 15:02:27 UTC (rev 6380)
+++ trunk/ChangeLog     2015-07-03 15:51:22 UTC (rev 6381)
@@ -3,6 +3,12 @@
        * man/Makefile.am (mi_perl5lib_path): Add directories containing 
        XSParagraph files.
 
+       * tp/texi2any.pl (BEGIN): Change directories to look for modules 
+       in.
+       * tp/tests/run_parser_all.sh: Pass more -I flags when running 
+       texi2any.
+       * tp/Makefile.am (AM_T_LOG_FLAGS): -I flags changed.
+
 2015-07-02  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/XSParagraph/configure.ac: Retrieve "cc" 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm     2015-07-03 
15:02:27 UTC (rev 6380)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/XSParagraph.pm     2015-07-03 
15:51:22 UTC (rev 6381)
@@ -51,7 +51,7 @@
   for my $dir (@INC) {
     #print "checking $dir/$file\n";
     if (-f "$dir/$file") {
-      print "found $dir/$file\n";
+      #print "found $dir/$file\n";
       return ($dir, "$dir/$file");
     }
   }
@@ -90,7 +90,7 @@
   die "XSParagraph: couldn't find $dlname\n";
 }
 
-print STDERR "loadable object is at $dlpath\n";
+#print STDERR "loadable object is at $dlpath\n";
 
 my $module = "XSParagraph";
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-03 15:02:27 UTC 
(rev 6380)
+++ trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-03 15:51:22 UTC 
(rev 6381)
@@ -72,7 +72,7 @@
 void
 xspara_hello (void)
 {
-  puts ("hello world");
+  //puts ("initializing XSParagraph");
   if (!setlocale (LC_CTYPE, "en_US.UTF-8")
       && !setlocale (LC_CTYPE, "en_US.utf8"))
     {

Modified: trunk/tp/tests/run_parser_all.sh
===================================================================
--- trunk/tp/tests/run_parser_all.sh    2015-07-03 15:02:27 UTC (rev 6380)
+++ trunk/tp/tests/run_parser_all.sh    2015-07-03 15:51:22 UTC (rev 6381)
@@ -274,7 +274,8 @@
       # @setfilename
       echo "$command $dir" >>$logfile
       #echo "$dir($format)"
-      cmd="$prepended_command $PERL -w -I $srcdir/../ -I 
$srcdir/../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../maintain/lib/libintl-perl/lib/ -I 
$srcdir/../maintain/lib/Text-Unidecode/lib/ $command_run $format_option --force 
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
--output ${outdir}$dir/ -I $testdir/ -I $srcdir/ 
--set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2" >> $logfile
+      cmd="$prepended_command $PERL -w -I $srcdir/../ -I 
$srcdir/../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../maintain/lib/libintl-perl/lib/ -I 
$srcdir/../maintain/lib/Text-Unidecode/lib/ -I 
../tp/Texinfo/Convert/XSParagraph -I ../tp/Texinfo/Convert/XSParagraph/lib 
$command_run $format_option --force --conf-dir $srcdir/../t/init/ --conf-dir 
$srcdir/../init --error-limit=1000 --set-customization-variable TEST=1 
--set-customization-variable L2H_CLEAN=0 --output ${outdir}$dir/ -I $testdir/ 
-I $srcdir/ --set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2" >> $logfile
+      # Note we didn't use $srcdir in the XSParagraph -I options.
       echo "$cmd" >>$logfile
       eval $cmd
       ret=$?

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2015-07-03 15:02:27 UTC (rev 6380)
+++ trunk/tp/texi2any.pl        2015-07-03 15:51:22 UTC (rev 6381)
@@ -50,8 +50,11 @@
   my ($real_command_name, $command_directory, $command_suffix) 
      = fileparse($0, '.pl');
 
+  # These are substituted by the Makefile to create "texi2any".
   my $datadir = '@datadir@';
   my $package = '@PACKAGE@';
+  my $packagedir = '@pkglibexecdir@/Texinfo';
+
   my $updir = File::Spec->updir();
 
   my $texinfolibdir;
@@ -67,7 +70,12 @@
     }
     $lib_dir = File::Spec->catdir($texinfolibdir, 'maintain');
     unshift @INC, $texinfolibdir;
+
+    # For XSParagraph.pm, XSParagraph.la, and XSParagraph.so.
+    push @INC, "${texinfolibdir}Texinfo/Convert/XSParagraph/lib";
+    push @INC, "${texinfolibdir}Texinfo/Convert/XSParagraph";
   } elsif ($datadir ne '@' .'datadir@' and $package ne '@' . 'PACKAGE@'
+           and $packagedir ne '@' .'pkglibexecdir@/Texinfo'
            and $datadir ne '') {
     $texinfolibdir = File::Spec->catdir($datadir, $package);
     # try to make package relocatable, will only work if standard relative 
paths
@@ -86,10 +94,10 @@
     # searched for before the installation directories.  This could
     # cause trouble if the modules are separately installed.
     push @INC, $texinfolibdir;
+
+    # For XSParagraph.pm and XSParagraph.so.
+    push @INC, $packagedir;
   }
-  push @INC, "${texinfolibdir}Texinfo/Convert/XSParagraph/lib";
-  push @INC, "${texinfolibdir}Texinfo/Convert/XSParagraph/blib/arch";
-  push @INC, "${texinfolibdir}Texinfo/Convert/XSParagraph";
 
   # '@USE_EXTERNAL_LIBINTL @ and similar are substituted in the
   # makefile using values from configure