* bin/autom4te.in: --normalize is a new option.

* bin/autoconf.in: Use it.

diff --git a/ChangeLog b/ChangeLog
index dc5690194043ee8371baf539da230f86d436e80d..34ec3b05a6050327a7df79fc2e583bf85eb32c83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-17  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in: --normalize is a new option.
+       * bin/autoconf.in: Use it.
+
 2001-08-17  Akim Demaille  <akim@epita.fr>
 
        * bin/Makefile.am, lib/Autom4te/Makefile.am, lib/autoconf/Makefile.am

diff --git a/bin/autoconf.in b/bin/autoconf.in
index b0709cb13d903e1a2089a810413668b0e5abbee9..49169663376fd30220f923d484d2c8f3338e3cd3 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -236,6 +236,7 @@ run_autom4te="$autom4te "\
 `$verbose "--verbose "`\
 `$debug && echo "--debug "`\
 `$force && echo "--force "`\
+"--normalize "\
 "--include $autoconf_dir --include $localdir "\
 "--warning syntax,$warnings "\
 "$preselect"\

diff --git a/bin/autom4te.in b/bin/autom4te.in
index f40b7af1b8a7ef177a4b8320d9bf3b5c09dceb06..f87a73913283e2a343364eb3981c03ee4ebc49e4 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -255,6 +255,9 @@ my @preselect = ('include', 'm4_pattern_allow', 'm4_pattern_forbid');
 
 my $output = '-';
 
+# Should we normalize the output?
+my $normalize = 0;
+
 # Autom4te's default warnings, and the actual list of warnings.
 my @my_warning = ('syntax');
 my @warning;
@@ -388,6 +391,7 @@ Operation modes:
   -v, --verbose            verbosely report processing
   -d, --debug              don\'t remove temporary files
   -o, --output=FILE        save output in FILE (defaults to \`-\', stdout)
+      --normalize          smash successive empty lines
   -f, --force              don\'t rely on cached values
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY
 
@@ -579,7 +583,7 @@ sub handle_output ($$)
   while ($_ = $in->getline)
     {
       s/\s+$//;
-      if (/^$/)
+      if ($normalize && /^$/)
        {
          $separate = 1;
          next;

diff --git a/man/autom4te.1 b/man/autom4te.1
index 75ae198662b806be46e799ee9318fda79e200b25..e9be5e8923cfd8d32ee0d38dd72e8e6bed75595d 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -26,6 +26,9 @@ don't remove temporary files
 \fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
 save output in FILE (defaults to `-', stdout)
 .TP
+\fB\-\-normalize\fR
+smash successive empty lines
+.TP
 \fB\-f\fR, \fB\-\-force\fR
 don't rely on cached values
 .TP