texinfo configure.ac ChangeLog tp/README tp/Tex...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/02 18:09:33

Modified files:
        .              : configure.ac ChangeLog 
        tp             : README 
        tp/Texinfo/Convert: Unicode.pm 

Log message:
                * configure.ac: remove gnulib module regex snippet, it is 
already in 
                gnulib/m4/gnulib-comp.m4.
                * configure.ac, tp/Texinfo/Convert/Unicode.pm: check that 
Encode is
                available, and use perl >= 5.7.3, required for Encode.  Report 
from 
                Stefano Lattarini.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1468&r2=1.1469
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/README?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Unicode.pm?cvsroot=texinfo&r1=1.33&r2=1.34

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- configure.ac        26 Nov 2012 19:27:08 -0000      1.125
+++ configure.ac        2 Dec 2012 18:09:32 -0000       1.126
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.125 2012/11/26 19:27:08 karl Exp $
+# $Id: configure.ac,v 1.126 2012/12/02 18:09:32 pertusus Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
@@ -35,6 +35,9 @@
 AC_SUBST([PACKAGE_DATE])
 
 # We need Perl
+AC_ARG_VAR([PERL], [The path to the 'perl' executable.])
+dnl AC_PATH_PROG([PERL], [perl], [/usr/bin/env perl], [/opt/perl5/bin:"$PATH"])
+
 AC_PATH_PROG([PERL], [perl])
 if test -z "$PERL"; then
    AC_MSG_ERROR(
@@ -43,7 +46,18 @@
 specify where it is using
   ./configure PERL=/path/to/perl
 ])
+fi
 
+
+AC_MSG_CHECKING([Perl version and Encode module])
+if $PERL -e "use 5.007_003; use Encode;" > /dev/null 2>&1; then
+  perl_version_requirement='yes'
+else
+  perl_version_requirement='no'
+fi
+AC_MSG_RESULT($perl_version_requirement)
+if test z"$perl_version_requirement" = 'zno' ; then
+  AC_MSG_ERROR([perl >= 5.7.3 with Encode required by Texinfo.])
 fi
 
 # Checks for programs.
@@ -57,13 +71,6 @@
 # Rest of Gnulib.
 gl_INIT
 
-# Regex from Gnulib if needed.
-gl_REGEX
-if test $ac_use_included_regex = yes; then
-  AC_LIBOBJ([regex])
-  gl_PREREQ_REGEX
-fi 
-
 # help2man to generate man pages.
 AM_MISSING_PROG(HELP2MAN, help2man)
 
@@ -77,9 +84,6 @@
 MKINSTALLDIRS="\$(top_srcdir)/build-aux/install-sh -d"
 AC_SUBST([MKINSTALLDIRS])
 
-AC_ARG_VAR([PERL], [The path to the 'perl' executable.])
-AC_PATH_PROG([PERL], [perl], [/usr/bin/env perl], [/opt/perl5/bin:"$PATH"])
-
 # Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
 AC_CHECK_FUNC(sigblock, , [AC_CHECK_LIB(bsd, sigblock)])
 
@@ -307,7 +311,7 @@
     [
      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 
Storable qw(dclone); use Getopt::Long qw(GetOptions);" > /dev/null 2>&1;
+     elif $PERL -e "use 5.007_003; use Encode; use Test::More; use 
File::Basename; use File::Copy; use Data::Dumper; use Data::Compare; use 
Test::Deep; use Storable qw(dclone); use Getopt::Long qw(GetOptions);" > 
/dev/null 2>&1;
      then
        tp_tests='yes'
      else  
@@ -329,7 +333,7 @@
        build_perl_api_texi='yes'
      fi],
     [
-     if $PERL -e "use 5.006; use Encode; use Pod::Simple::PullParser;" > 
/dev/null 2>&1;
+     if $PERL -e "use 5.007_003; use Encode; use Pod::Simple::PullParser;" > 
/dev/null 2>&1;
      then
        build_perl_api_texi='yes'
      else  
@@ -353,7 +357,7 @@
     [
      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;
+     elif $PERL -e "use 5.007_003; use Encode; use Test::More; use 
Pod::Simple::PullParser;" > /dev/null 2>&1;
      then
        pod_simple_texinfo_tests='yes'
      else

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1468
retrieving revision 1.1469
diff -u -b -r1.1468 -r1.1469
--- ChangeLog   1 Dec 2012 15:15:44 -0000       1.1468
+++ ChangeLog   2 Dec 2012 18:09:32 -0000       1.1469
@@ -1,3 +1,11 @@
+2012-12-02  Patrice Dumas  <address@hidden>
+
+       * configure.ac: remove gnulib module regex snippet, it is already in 
+       gnulib/m4/gnulib-comp.m4.
+       * configure.ac, tp/Texinfo/Convert/Unicode.pm: check that Encode is
+       available, and use perl >= 5.7.3, required for Encode.  Report from 
+       Stefano Lattarini.
+
 2012-12-01  Sergey Poznyakoff  <address@hidden>
 
        Fix bug #37822 (incomplete redraw of screen).

Index: tp/README
===================================================================
RCS file: /sources/texinfo/texinfo/tp/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/README   30 Nov 2012 18:31:30 -0000      1.10
+++ tp/README   2 Dec 2012 18:09:33 -0000       1.11
@@ -1,4 +1,4 @@
-$Id: README,v 1.10 2012/11/30 18:31:30 pertusus Exp $
+$Id: README,v 1.11 2012/12/02 18:09:33 pertusus Exp $
 texinfo/tp/README
 
   Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -11,7 +11,7 @@
 tree representing the Texinfo code structure.
 
 These other modules and libraries are required.  All have been standard
-parts of Perl for years, at least since 5.007003.
+parts of Perl for years, at least since 5.7.3.
   Carp, Config, Data::Dumper, Encode, File::Basename, File::Spec
   Getopt::Long, Unicode::Normalize, Storable
 

Index: tp/Texinfo/Convert/Unicode.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- tp/Texinfo/Convert/Unicode.pm       25 Sep 2012 17:46:37 -0000      1.33
+++ tp/Texinfo/Convert/Unicode.pm       2 Dec 2012 18:09:33 -0000       1.34
@@ -19,7 +19,10 @@
 
 package Texinfo::Convert::Unicode;
 
-use 5.006;
+# Seems to be the perl version required for Encode:
+# http://cpansearch.perl.org/src/DANKOGAI/Encode-2.47/Encode/README.e2x
+# 
http://coding.derkeiler.com/Archive/Perl/comp.lang.perl.misc/2005-12/msg00833.html
+use 5.007_003;
 use strict;
 
 use Encode;