[PATCH] {remove-deansification} automake: remove special handling of `ANSI2KNR' make variable

[Stefano Lattarini]

The testsuite still passes with this patch applied.  I will push it to
the 'remove-deansification' branch and merge it into master in a couple
of days if there is no objection.

-*-*-*-

automake: remove special handling of `ANSI2KNR' make variable

* automake.in (define_configure_variable): Remove special-cased
handling of `ANSI2KNR' variable.  Related minor simplifications.
---
 ChangeLog   |    6 ++++++
 automake.in |   15 ++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50cedb7..96cb905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-16  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        automake: fix regression due to de-ansification support removal
diff --git a/automake.in b/automake.in
index 288ff61..9ee2d68 100644
--- a/automake.in
+++ b/automake.in
@@ -6330,22 +6330,11 @@ sub define_files_variable (address@hidden)
 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 = @address@hidden when address@hidden@` 
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);
 }
 
-- 
1.7.2.3