[Texi2html-cvs] texi2html configure configure.ac texi2html.pl

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/11/06 23:54:41

Modified files:
        .              : configure configure.ac texi2html.pl 

Log message:
        Define MKDIR_P if not done (not done in automake 1.9.6).
        Don't undef ENV{'LANGUAGE'}, old perl doesn't like it).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure?cvsroot=texi2html&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure.ac?cvsroot=texi2html&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.350&r2=1.351

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- configure   5 Nov 2009 22:55:07 -0000       1.68
+++ configure   6 Nov 2009 23:54:40 -0000       1.69
@@ -5465,6 +5465,13 @@
 esac
 
 
+# Happens with some automake version
+if test z"$MKDIR_P" = 'z'; then
+  MKDIR_P=$mkdir_p
+
+fi
+
+
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

Index: configure.ac
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- configure.ac        6 Nov 2009 21:27:41 -0000       1.27
+++ configure.ac        6 Nov 2009 23:54:40 -0000       1.28
@@ -21,6 +21,13 @@
 dnl Checks for programs.
 AC_PROG_LN_S
 AM_PROG_MKDIR_P
+
+# Happens with some automake version
+if test z"$MKDIR_P" = 'z'; then
+  MKDIR_P=$mkdir_p
+  AC_SUBST([MKDIR_P])
+fi
+
 AC_ARG_VAR([PERL], [The path to the 'perl' executable.])
 AC_PATH_PROG([PERL], [perl], [/usr/bin/env perl], [/opt/perl5/bin:"$PATH"])
 

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -b -r1.350 -r1.351
--- texi2html.pl        5 Nov 2009 22:55:07 -0000       1.350
+++ texi2html.pl        6 Nov 2009 23:54:40 -0000       1.351
@@ -86,7 +86,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.350 2009/11/05 22:55:07 pertusus Exp $
+# $Id: texi2html.pl,v 1.351 2009/11/06 23:54:40 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -2559,8 +2559,15 @@
          $result = Locale::Messages::pgettext($context, $message);
     }
     Locale::Messages::textdomain($messages_textdomain);
+    # old perl complains 'Use of uninitialized value in scalar assignment'
+    if (!defined($saved_LANGUAGE))
+    {
+       delete ($ENV{'LANGUAGE'});
+    }
+    else
+    {
     $ENV{'LANGUAGE'} = $saved_LANGUAGE;
-
+    }
     if ($state->{'keep_texi'})
     {
          $result =~ s/\{($re)\}/defined $context->{$1} ? $context->{$1} : 
"{$1}"/ge if (defined($re));