texinfo ChangeLog configure.ac doc/tp_api/Makef...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/11/17 19:13:37

Modified files:
        .              : ChangeLog configure.ac 
        doc/tp_api     : Makefile.am 
        Pod-Simple-Texinfo: Makefile.am 

Log message:
                * configure.ac, Pod-Simple-Texinfo/Makefile.am, 
doc/tp_api/Makefile.am:
                new conditionals, BUILD_PERL_API_TEXI and 
POD_SIMPLE_TEXINFO_TESTS to
                avoid rebuilding the texinfo files from pod documentnation if 
                Pod::Simple::PullParser, and avoid running the 
Pod-Simple-Texinfo tests
                if Test::More is not present.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1448&r2=1.1449
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/tp_api/Makefile.am?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/Makefile.am?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1448
retrieving revision 1.1449
diff -u -b -r1.1448 -r1.1449
--- ChangeLog   17 Nov 2012 17:16:18 -0000      1.1448
+++ ChangeLog   17 Nov 2012 19:13:37 -0000      1.1449
@@ -1,3 +1,11 @@
+2012-11-17  Patrice Dumas  <address@hidden>
+
+       * configure.ac, Pod-Simple-Texinfo/Makefile.am, doc/tp_api/Makefile.am:
+       new conditionals, BUILD_PERL_API_TEXI and POD_SIMPLE_TEXINFO_TESTS to
+       avoid rebuilding the texinfo files from pod documentnation if 
+       Pod::Simple::PullParser, and avoid running the Pod-Simple-Texinfo tests
+       if Test::More is not present.
+
 2012-11-17  Sergey Poznyakoff  <address@hidden>
 
        Use the text attribute to represent "image" tag.

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- configure.ac        16 Nov 2012 01:26:27 -0000      1.121
+++ configure.ac        17 Nov 2012 19:13:37 -0000      1.122
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.121 2012/11/16 01:26:27 pertusus Exp $
+# $Id: configure.ac,v 1.122 2012/11/17 19:13:37 pertusus Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
@@ -313,6 +313,53 @@
 AC_MSG_RESULT([$tp_tests])
 AM_CONDITIONAL([TP_TESTS], [test "z$tp_tests" = 'zyes'])
 
+build_perl_api_texi='no'
+AC_ARG_ENABLE([perl-api-texi-build],
+    AC_HELP_STRING([--enable-perl-api-texi-build],
+        [build the perl api texinfo files (default: detected)]),
+    [if test $enableval = 'no'; then
+       build_perl_api_texi='no'
+     else
+       build_perl_api_texi='yes'
+     fi],
+    [
+     if $PERL -e "use 5.006; use Encode; use Pod::Simple::PullParser;" > 
/dev/null 2>&1;
+     then
+       build_perl_api_texi='yes'
+     else  
+       build_perl_api_texi='no'
+     fi
+    ])
+
+AC_MSG_CHECKING([Perl Texinfo API texinfo documentation build requirements])
+AC_MSG_RESULT([$build_perl_api_texi])
+AM_CONDITIONAL([BUILD_PERL_API_TEXI], [test "z$build_perl_api_texi" = 'zyes'])
+
+pod_simple_texinfo_tests='no'
+AC_ARG_ENABLE([pod-simple-texinfo-tests],
+    AC_HELP_STRING([--enable-pod-simple-texinfo-tests],
+        [run the parser and converters testsuite (default: detected)]),
+    [if test $enableval = 'no'; then
+       pod_simple_texinfo_tests='no'
+     else
+       pod_simple_texinfo_tests='yes'
+     fi],
+    [
+     if test "z$PROVE" = 'z' ; then
+       pod_simple_texinfo_tests='no'
+     elif $PERL -e "use 5.006; use Encode; use Test::More; use 
Pod::Simple::PullParser;" > /dev/null 2>&1;
+     then
+       pod_simple_texinfo_tests='yes'
+     else
+       pod_simple_texinfo_tests='no'
+     fi
+    ])
+
+AC_MSG_CHECKING([Pod::Simple::Texinfo tests requirements])
+AC_MSG_RESULT([$pod_simple_texinfo_tests])
+AM_CONDITIONAL([POD_SIMPLE_TEXINFO_TESTS], [test "z$pod_simple_texinfo_tests" 
= 'zyes'])
+
+
 dnl The bulk config files.
 AC_CONFIG_FILES([\
   Makefile

Index: doc/tp_api/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/tp_api/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/tp_api/Makefile.am      12 Nov 2012 01:24:39 -0000      1.6
+++ doc/tp_api/Makefile.am      17 Nov 2012 19:13:37 -0000      1.7
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2012/11/12 01:24:39 pertusus Exp $
+# $Id: Makefile.am,v 1.7 2012/11/17 19:13:37 pertusus Exp $
 # Makefile.am for texinfo/doc/tp_api.
 #
 # Copyright 2012
@@ -16,11 +16,14 @@
 # cross-compiling.
 MAKEINFO = $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl
 
+if BUILD_PERL_API_TEXI
+
 dist_info_TEXINFOS = tp_api.texi
 #info_TEXINFOS_SOURCES = tp_api.texi
 tp_api_TEXINFOS = tp_api.texi
 #dist_tp_api_TEXINFOS = tp_api.texi
 #tp_api_SOURCES = tp_api.texi
+
 BUILT_SOURCES = tp_api.texi
 
 #DISTCLEANFILES = tp_api.info
@@ -44,3 +47,5 @@
        $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --top 
'Texinfo perl module' --subdir=api_includes -o $@ $(tp_api_dependencies)
 
 EXTRA_DIST = api_includes tp_api.texi
+
+endif

Index: Pod-Simple-Texinfo/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Pod-Simple-Texinfo/Makefile.am      11 Nov 2012 00:44:36 -0000      1.5
+++ Pod-Simple-Texinfo/Makefile.am      17 Nov 2012 19:13:37 -0000      1.6
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.5 2012/11/11 00:44:36 karl Exp $
+# $Id: Makefile.am,v 1.6 2012/11/17 19:13:37 pertusus Exp $
 # Makefile.am for texinfo/Pod-Simple_Texinfo.
 # Copyright 2012 Free Software Foundation, Inc.
 #
@@ -12,12 +12,14 @@
 
 nodist_bin_SCRIPTS = pod2texi
 
+test_files = prove.sh
+
 EXTRA_DIST = Changes \
  Makefile.PL \
  MANIFEST \
  t/Pod-Simple-Texinfo.t \
  pod2texi.pl \
- $(TESTS)
+ $(test_files)
 
 modulesdir = $(pkgdatadir)/Pod-Simple-Texinfo/Pod/Simple/
 
@@ -29,6 +31,8 @@
        -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/pod2texi.pl >$@
        chmod a+x $@
 
-TESTS = prove.sh
+if POD_SIMPLE_TEXINFO_TESTS
+TESTS = $(test_files)
+endif
 
 DISTCLEANFILES = pod2texi