* bin/autom4te.in (--normalize): Remove.

* lib/autom4te.in: Adjust.

diff --git a/ChangeLog b/ChangeLog
index 36462a34bed3f3b0a054eae224ba04a1b4ff6a7a..7a47dd61445ad8411d9522d8609235903b430c14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-05  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in (--normalize): Remove.
+       * lib/autom4te.in: Adjust.
+
 2001-11-05  Akim Demaille  <akim@epita.fr>
 
        * tests/Makefile.am (testsuite): Rename this target as...

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 1a1f37356ce69821304c8e4ecc4c051dad64d22a..abd045ad9d9f339010f36be882d9fd1a47ddef8c 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -239,9 +239,6 @@ my %language;
 
 my $output = '-';
 
-# Should we normalize the output?
-my $normalize = 0;
-
 # Mode of the output file except for traces.
 my $mode = "0666";
 
@@ -360,7 +357,6 @@ 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
   -l, --language=LANG      specify the set of M4 macros to use
@@ -483,7 +479,6 @@ sub parse_args ()
     (
      # Operation modes:
      "o|output=s"   => \$output,
-     "normalize"    => \$normalize,
      "W|warnings=s" => \@warning,
      "m|mode=s"     => \$mode,
      "M|melt"       => \$melt,
@@ -631,29 +626,12 @@ sub handle_output ($$)
     unless $out;
   my $in = new Autom4te::XFile ($ocache . $req->id);
 
-  my $separate = 0;
-  my $oline = 0;
   my %prohibited;
   my $res;
   while ($_ = $in->getline)
     {
       s/\s+$//;
-      if ($normalize && /^$/)
-       {
-         $separate = 1;
-         next;
-       }
-
-      if ($separate)
-       {
-         $oline++;
-         print $out "\n";
-       }
-      $separate = 0;
-
-      $oline++;
-      s/__oline__/$oline/g;
-
+      s/__oline__/$./g;
       s/\@<:\@/[/g;
       s/\@:>\@/]/g;
       s/\@S\|\@/\$/g;
@@ -667,7 +645,7 @@ sub handle_output ($$)
        unless /^\#\s*(if|include|endif|ifdef|ifndef|define)\b/;
       foreach (split (/\W+/))
        {
-         $prohibited{$_} = $oline
+         $prohibited{$_} = $.
            if /$forbidden/o && !/$allowed/o && ! exists $prohibited{$_};
        }
 

diff --git a/configure b/configure
index 3fa7ea280e016aac63e8fffac8db13260da327b1..db80c6c9e8bd2451ad848a6fecc5183e0c571705 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52e for GNU Autoconf 2.52g.
+# Generated by GNU Autoconf 2.52g for GNU Autoconf 2.52g.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -838,7 +838,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Autoconf configure 2.52g
-generated by GNU Autoconf 2.52e
+generated by GNU Autoconf 2.52g
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
@@ -853,7 +853,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Autoconf $as_me 2.52g, which was
-generated by GNU Autoconf 2.52e.  Invocation command line was
+generated by GNU Autoconf 2.52g.  Invocation command line was
 
   $ $0 $@
 
@@ -2021,7 +2021,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Autoconf $as_me 2.52g, which was
-generated by GNU Autoconf 2.52e.  Invocation command line was
+generated by GNU Autoconf 2.52g.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2078,7 +2078,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Autoconf config.status 2.52g
-configured by $0, generated by GNU Autoconf 2.52e,
+configured by $0, generated by GNU Autoconf 2.52g,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001

diff --git a/lib/autom4te.in b/lib/autom4te.in
index dd893ef30b0dbe3f1863d747d424e2761bfab207..7c2cb3530b00fead0fd88be004ffb1aef517c973 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -134,7 +134,6 @@ args: acsite.m4?
 args: aclocal.m4?
 args: --mode 777
 args: --warning syntax
-args: --normalize
 args: --language Autoheader-preselections
 args: --language Automake-preselections
 args: --language Autoreconf-preselections

diff --git a/man/autom4te.1 b/man/autom4te.1
index 957ed02a5d44977d254d97dd5df8deb318674936..ee70108c15845366e63f041e7254d627f3214741 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -29,9 +29,6 @@ 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