[Automake-commit] [SCM] GNU Automake branch, remove-deansification, updated. v1.11-949-g76b756f

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=76b756f9a40ca7b086d8239f48b0363e394eda5b

The branch, remove-deansification has been updated
       via  76b756f9a40ca7b086d8239f48b0363e394eda5b (commit)
      from  199b9086f51927fb99663cac42934337352cce69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 76b756f9a40ca7b086d8239f48b0363e394eda5b
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 16 13:41:42 2011 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 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);
 }
 


hooks/post-receive
-- 
GNU Automake