automake: remove special handling of `ANSI2KNR' make variable

* automake.in (define_configure_variable): Remove special-cased
handling of `ANSI2KNR' variable.  Related minor simplifications.

diff --git a/ChangeLog b/ChangeLog
index 50cedb7f14cd96c490114b2be765c3a83e7f1366..96cb9054656c8bce07c2f9b609b4f4c5c9590709 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       automake: remove special handling of `ANSI2KNR' make variable
+       * automake.in (define_configure_variable): Remove special-cased
+       handling of `ANSI2KNR' variable.  Related minor simplifications.
+
 2011-09-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        automake: fix regression due to de-ansification support removal

diff --git a/automake.in b/automake.in
index 288ff61f737da7a270e96390da1d001ff9cc3298..9ee2d68b058d6d6364b4ce749de1cd4caf117c01 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -6330,22 +6330,11 @@ sub define_files_variable ($\@$$)
 sub define_configure_variable ($)
 {
   my ($var) = @_;
-
-  my $pretty = VAR_ASIS;
-  my $owner = VAR_CONFIGURE;
-
   # Some variables we do not want to output.  For instance it
   # would be a bad idea to output `U = @U@` when `@U@` can be
   # substituted as `\`.
-  $pretty = VAR_SILENT if exists $ignored_configure_vars{$var};
-
-  # ANSI2KNR is a variable that Automake wants to redefine, so
-  # it must be owned by Automake.  (It is also used as a proof
-  # that AM_C_PROTOTYPES has been run, that's why we do not simply
-  # omit the AC_SUBST.)
-  $owner = VAR_AUTOMAKE if $var eq 'ANSI2KNR';
-
-  Automake::Variable::define ($var, $owner, '', TRUE, subst $var,
+  my $pretty = exists $ignored_configure_vars{$var} ? VAR_SILENT : VAR_ASIS;
+  Automake::Variable::define ($var, VAR_CONFIGURE, '', TRUE, subst $var,
                              '', $configure_vars{$var}, $pretty);
 }