Index: autoheader.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoheader.in,v
retrieving revision 1.146
diff -u -r1.146 autoheader.in
--- autoheader.in	16 Oct 2006 20:58:44 -0000	1.146
+++ autoheader.in	5 Dec 2006 12:21:43 -0000
@@ -54,7 +54,9 @@
 # Lib files.
 my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 local $config_h;
+my $config_h_pre;
 my $config_h_in;
+my $config_h_post;
 my @prepend_include;
 my @include;
 
@@ -192,7 +194,12 @@
 # We template only the first CONFIG_HEADER.
 $config_h =~ s/ .*//;
 # Support "outfile[:infile]", defaulting infile="outfile.in".
-($config_h, $config_h_in) = split (':', $config_h, 2);
+($config_h, $config_h_pre, $config_h_in, $config_h_post)
+                                                 = split (':', $config_h, 4);
+if (length($config_h_in) == 0 && length($config_h_post) == 0)
+  {
+    $config_h_in = $config_h_pre;
+  }
 $config_h_in ||= "$config_h.in";
 
 # %SYMBOL might contain things like `F77_FUNC(name,NAME)', but we keep