From: Akim Demaille <akim@epita.fr>
Date: Mon, 5 Mar 2001 19:29:16 +0000 (+0000)
Subject: * automake.in (&handle_options): Change the RE so that the third
X-Git-Tag: handle-languages~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60d9bbc8e40d6a0f1f3f7bbe873bbb12e85177e5;p=thirdparty%2Fautomake.git

* automake.in (&handle_options): Change the RE so that the third
part of the versions always exist.
(&file_contents): Don't pass uninitialized values to &transform.
---

diff --git a/ChangeLog b/ChangeLog
index 4574fd7f3..425648c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (&handle_options): Change the RE so that the third
+	part of the versions always exist.
+	(&file_contents): Don't pass uninitialized values to &transform.
+
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&file_contents): Require a hash as second argument.
diff --git a/automake.in b/automake.in
index 89ddfcb6e..9757d0141 100755
--- a/automake.in
+++ b/automake.in
@@ -1185,14 +1185,14 @@ sub handle_options
 	    {
 		$use_dependencies = 0;
 	    }
-	    elsif (/([0-9]+)\.([0-9]+)([a-z])?/)
+	    elsif (/([0-9]+)\.([0-9]+)([a-z]?)/)
 	    {
 		# Got a version number.
 
 		my ($rmajor, $rminor, $ralpha) = ($1, $2, $3);
 
 		&prog_error ("version is incorrect: $VERSION")
-		    if $VERSION !~ /([0-9]+)\.([0-9]+)([a-z])?/;
+		    if $VERSION !~ /([0-9]+)\.([0-9]+)([a-z]?)/;
 
 		my ($tmajor, $tminor, $talpha) = ($1, $2, $3);
 
@@ -6634,14 +6634,14 @@ sub file_contents ($%)
 		      'MAINTAINER-MODE'
 		      => $seen_maint_mode ? '@MAINTAINER_MODE_TRUE@' : '',
 
-		      'SHAR'        => $options{'dist-shar'},
-		      'BZIP2'       => $options{'dist-bzip2'},
-		      'ZIP'         => $options{'dist-zip'},
-		      'COMPRESS'    => $options{'dist-tarZ'},
+		      'SHAR'        => $options{'dist-shar'} || 0,
+		      'BZIP2'       => $options{'dist-bzip2'} || 0,
+		      'ZIP'         => $options{'dist-zip'} || 0,
+		      'COMPRESS'    => $options{'dist-tarZ'} || 0,
 
 		      'INSTALL-INFO' => !$options{'no-installinfo'},
 		      'INSTALL-MAN'  => !$options{'no-installman'},
-		      'CK-NEWS'      => $options{'check-news'},
+		      'CK-NEWS'      => $options{'check-news'} || 0,
 
 		      'SUBDIRS'      => &variable_defined ('SUBDIRS'),
 		      'CONFIGURE-AC' => $configure_ac,