[6479] perl's cc for dependency checking style

[Gavin D. Smith]

Revision: 6479
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6479
Author:   gavin
Date:     2015-07-28 19:03:48 +0000 (Tue, 28 Jul 2015)
Log Message:
-----------
perl's cc for dependency checking style

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
    trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-28 17:12:24 UTC (rev 6478)
+++ trunk/ChangeLog     2015-07-28 19:03:48 UTC (rev 6479)
@@ -1,5 +1,15 @@
 2015-07-28  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/configure.ac: Check for
+       Perl's CC before AC_PROG_CC so the automatic dependency checking 
+       style will not be inappropriate.
+       * tp/Texinfo/Convert/XSParagraph/Makefile.am: Move setting of CC 
+       from here to configure.ac.
+
+       * tp/texi2any.pl: Show error message if loading a module failed.
+
+2015-07-28  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/XSParagraph: Run "libtoolize --copy --force"
        for libtool 2.4.6.
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-07-28 17:12:24 UTC 
(rev 6478)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-07-28 19:03:48 UTC 
(rev 6479)
@@ -41,19 +41,8 @@
 
 EXTRA_DIST += fetch_conf.pl
 
-# TODO: Rules for installing
-
-# TODO: Figure out what Make variables we need
-
-#PERL_INC = /usr/lib/perl5/CORE
 PERL_INC = $(PERL_CONF_archlibexp)/CORE
 
-#PERL = /usr/bin/perl5.18.1
-
-# It's essential that we use the same compiler that was used to build
-# Perl.  Otherwise Perl's "config.h" will be incorrect.
-CC = $(PERL_CONF_cc)
-
 XSUBPPARGS = -typemap $(PERL_CONF_privlibexp)/ExtUtils/typemap
 
 #XSUBPPARGS = -typemap /usr/share/perl5/ExtUtils/typemap

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-07-28 17:12:24 UTC 
(rev 6478)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-07-28 19:03:48 UTC 
(rev 6479)
@@ -2,15 +2,6 @@
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_PROG_CC
-
-gl_EARLY
-gl_INIT
-
-LT_INIT
-
-AC_PATH_PROG([PERL], [perl])
-
 fetch_conf ()
 {
           conf_value=`${PERL} -V:$1`
@@ -48,12 +39,25 @@
           AC_SUBST([PERL_CONF_$1], [$conf_value])
          ])
 
+AC_PATH_PROG([PERL], [perl])
 
+# It's essential that we use the same compiler that was used to build
+# Perl.  Otherwise Perl's "config.h" will be incorrect.
+lookup_perl_conf([cc])
+CC=$conf_value
+
+AC_PROG_CC
+
+gl_EARLY
+gl_INIT
+
+LT_INIT
+
+
 lookup_perl_flags([ccflags])
 lookup_perl_flags([cccdlflags])
 
 lookup_perl_conf([archlibexp])
-lookup_perl_conf([cc])
 lookup_perl_conf([privlibexp])
 
 # TODO: would be nice to be able to do lookup_perl_conf([ccflags cccdlflags])

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2015-07-28 17:12:24 UTC (rev 6478)
+++ trunk/tp/texi2any.pl        2015-07-28 19:03:48 UTC (rev 6479)
@@ -1108,7 +1108,8 @@
 
 if (defined($formats_table{$format}->{'module'})) {
   # Speed up initialization by only loading the module we need.
-  eval "require $formats_table{$format}->{'module'};";
+  eval "require $formats_table{$format}->{'module'};"
+      or die "$@";
   eval '$formats_table{$format}->{\'converter\'} = sub{'.
                 $formats_table{$format}->{'module'}
         .'->converter(@_)};';