From 969517ed7b02e46f2d5bcc4b47a78aaa3c9dd1ca Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Sun, 23 Sep 2001 17:18:20 +0000
Subject: [PATCH] * bin/autom4te.in (parse_args): There can be several
 invocations of --language now.

---
 ChangeLog       |  5 +++++
 bin/autom4te.in | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7cf59102..452c5b27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-23  Akim Demaille  <akim@epita.fr>
+
+	* bin/autom4te.in (parse_args): There can be several invocations
+	of --language now.
+
 2001-09-23  Akim Demaille  <akim@epita.fr>
 
 	* doc/autoconf.texi (Top): Wrap in @ifnottex.
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 287528ea..1e1915bc 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -461,20 +461,21 @@ sub parse_args ()
   # We want to look for the early options, which should not be found
   # in the configuration file.  Prepend to the user arguments.
   # Perform this repeatedly so that we can use --language in language
-  # definitions.
-  my $language;
+  # definitions.  Beware that there can be several --language
+  # invocations.
+  my @language;
   do {
-    $language = undef;
+    @language = ();
     Getopt::Long::Configure ("pass_through");
-    getopt ("l|language=s" => \$language);
+    getopt ("l|language=s" => \@language);
 
-    if ($language)
+    foreach (@language)
       {
-	die "$me: unknown language: $language\n"
-	  unless exists $language{lc $language};
-	unshift @ARGV, @{$language{lc $language}};
+	die "$me: unknown language: $_\n"
+	  unless exists $language{lc $_};
+	unshift @ARGV, @{$language{lc $_}};
       }
-  } while $language;
+  } while @language;
 
   debug "arguments: @ARGV\n";