texinfo ChangeLog configure.ac tp/Makefile.am t...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/01 23:09:23

Modified files:
        .              : ChangeLog configure.ac 
        tp             : Makefile.am TODO 

Log message:
                * configure.ac, tp/Makefile.am: add an automake conditional to 
avoid 
                doing tp tests if dependencies are missing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1258&r2=1.1259
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.183&r2=1.184

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1258
retrieving revision 1.1259
diff -u -b -r1.1258 -r1.1259
--- ChangeLog   1 Oct 2011 20:39:05 -0000       1.1258
+++ ChangeLog   1 Oct 2011 23:09:21 -0000       1.1259
@@ -2,6 +2,8 @@
 
        * doc/texinfo.txi (Generic Translator texi2any/makeinfo): adapt to
        the new implementation in tp/.
+       * configure.ac, tp/Makefile.am: add an automake conditional to avoid 
+       doing tp tests if dependencies are missing.
 
 2011-09-30  Patrice Dumas  <address@hidden>
 

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- configure.ac        25 Sep 2011 22:07:04 -0000      1.101
+++ configure.ac        1 Oct 2011 23:09:22 -0000       1.102
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.101 2011/09/25 22:07:04 pertusus Exp $
+# $Id: configure.ac,v 1.102 2011/10/01 23:09:22 pertusus Exp $
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -321,7 +321,31 @@
 AC_CONFIG_FILES([util/defs])
 AC_CHECK_PROGS([HEVEA], [hevea], [])
 AC_CHECK_PROGS([TEX], [tex], [])
+AC_CHECK_PROGS([PROVE], [prove], [])
 
+tp_tests='no'
+AC_ARG_ENABLE([tp-tests],
+    AC_HELP_STRING([--enable-tp-tests],
+        [run the parser and converters testsuite (default: detected)]),
+    [if test $enableval = 'no'; then
+       tp_tests='no'
+     else
+       tp_tests='yes'
+     fi],
+    [
+     if test "z$PROVE" = 'z'; then
+       tp_tests='no'
+     elif $PERL -e "use 5.006; use Encode; use Test::More; use File::Basename; 
use File::Copy; use Data::Dumper; use Data::Compare; use Test::Deep; use Clone 
qw(clone); use Getopt::Long qw(GetOptions);" > /dev/null 2>&1;
+     then
+       tp_tests='yes'
+     else  
+       tp_tests='no'
+     fi
+    ])
+
+AC_MSG_CHECKING([parser tests requirements])
+AC_MSG_RESULT([$tp_tests])
+AM_CONDITIONAL([TP_TESTS], [test "z$tp_tests" = 'zyes'])
 
 AC_CONFIG_FILES([texi2html/texi2html_configured.pl:texi2html/texi2html.pl], 
    [chmod +x texi2html/texi2html_configured.pl])

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tp/Makefile.am      1 Oct 2011 20:52:12 -0000       1.5
+++ tp/Makefile.am      1 Oct 2011 23:09:22 -0000       1.6
@@ -139,13 +139,17 @@
          $(INSTALL_DATA) "$$file" "$(relative_include_dir)/$$bfile"; \
        done
 
-TESTS = prove.sh
+tp_tests = prove.sh
+
+if TP_TESTS
+TESTS = $(tp_tests)
+endif
 
 EXTRA_DIST = \
   texi2any.pl \
   $(test_results) \
   $(test_files) \
-  $(TESTS)
+  $(tp_tests)
 
 # FIXME put those somewhere else?  In maintain/lib?
 libsrcdir = $(srcdir)/../texi2html/lib

Index: tp/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- tp/TODO     1 Oct 2011 20:52:12 -0000       1.183
+++ tp/TODO     1 Oct 2011 23:09:23 -0000       1.184
@@ -2,8 +2,6 @@
 perl -w t/02coverage.t -o
 xmllint --nonet --noout --valid commands.xml
 
-Add automake conditionals if modules required for tests are not present.
-
 Handling of #line.
 
 In xml output, as can be seen in xtable/table_nested macro output do