[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-737-g962acb8

[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=962acb88fb57db0e58620250c681ad51190d0c5c

The branch, ng/master has been updated
       via  962acb88fb57db0e58620250c681ad51190d0c5c (commit)
       via  75e8d5ae392cf9caad74d42c35e6a1ef74f8dbc7 (commit)
       via  7626e632ebc2f47a3038b0aaf26b18af81060bfa (commit)
       via  c1ffbe9e605e3ef5166606c1d28518f33132b644 (commit)
       via  b4e64211f670b024fceb4e1dee8a1f288001307e (commit)
       via  00d2aff2e1a75045b36ca01194d8e29a44c0814b (commit)
       via  bff57c887dbd57ace4860b8cd83100cfca02f930 (commit)
       via  642fe026018962840aa08b329dad5b5ff9371a4e (commit)
       via  0fa7c9089931e07bb67cafbba47a0bb8c7348b36 (commit)
      from  19379bae87f4270d9f023b63d01a2107fb3de942 (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 962acb88fb57db0e58620250c681ad51190d0c5c
Merge: 642fe02 75e8d5a
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 29 00:50:34 2012 +0100

    Merge branch 'master' into ng/master
    
    * master:
      NEWS: better distinction between obsolete and obsolescent features
      cleanup: get rid of 'Automake::Configure_ac' module
      maint: remove last vestiges of 'configure.in' support from the testsuite
      tests: remove a botched comment from a test case
      maint: reflect removal of 'configure.in' support in comments and messages
      Drop support for 'configure.in' as the Autoconf input file
      Drop support for $(ACLOCAL_M4_SOURCES), it's obsolete
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 642fe026018962840aa08b329dad5b5ff9371a4e
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 28 23:35:03 2012 +0100

    NG-NEWS: adjust w.r.t. recent changes in Automake master
    
    The next version of Automake (1.14) is planned to drop few obsolete
    features that have already been removed in Automake-NG.  There is
    thus no need to list this dropped features in our NG-NEWS file (as
    Automake-NG will certainly see no stable release before Automake
    1.14 is out).
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                     |   18 ++++++++++++++----
 NG-NEWS                  |   18 ------------------
 aclocal.in               |    4 ++--
 automake.in              |    8 +++++---
 lib/Automake/Variable.pm |    1 -
 old/TODO                 |    4 ++--
 syntax-checks.mk         |   11 +++++++++++
 t/backcompat6.sh         |    3 +--
 t/help.sh                |    7 +++----
 9 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/NEWS b/NEWS
index be3ea37..faf79fd 100644
--- a/NEWS
+++ b/NEWS
@@ -11,10 +11,7 @@ New in 1.14:
     over the same-named automake-provided macro, as defined in file
     '/usr/local/share/aclocal-1.14/vala.m4'.
 
-* Obsolete and obsolescent features:
-
-  - Support for the long-obsolete $(INCLUDES) variable has been finally
-    removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+* Obsolescent features flagged:
 
   - Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
     To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
@@ -23,6 +20,19 @@ New in 1.14:
     'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
     bug#9037.
 
+* Obsolete features removed:
+
+  - Support for the long-deprecated name 'configure.in' for the Autoconf
+    input file has been removed altogether.  Just use the modern name
+    'configure.ac' instead.
+
+  - Support for the long-obsolete variable $(ACLOCAL_M4_SOURCES) has
+    been removed.  It should be safe to simply remove any definition
+    of it you have in your Makefiles.
+
+  - Support for the long-obsolete $(INCLUDES) variable has been finally
+    removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+
 * Removed support for obsolete platforms:
 
   - Support for the SGI C/C++ compilers has been removed: these compilers
diff --git a/NG-NEWS b/NG-NEWS
index 129da68..69d22e4 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -271,9 +271,6 @@ Obsolete Features Removed
   the once-accepted values '.txi' and '.texinfo' are not handled
   anymore, and their use will trigger an error.
 
-* Support for the long-deprecated name 'configure.in' for the Autoconf
-  input file (instead of the modern 'configure.ac') has been deprecated.
-
 * If the sources for a target library like 'libfoo.a' or 'libbar.la' are
   not explicitly specified, mainline Automake looks also (respectively)
   for the files 'libfoo_a.c' or 'libbar_la.c' as possible default sources.
@@ -293,21 +290,6 @@ Obsolete Features Removed
   Similarly, the $(mkinstallscripts) make variable is not defined anymore;
   one should use $(MKDIR_P) instead.
 
-* The $(INCLUDES) variable is not anymore passed to the invocations of
-  compilers with a C-like preprocessing step (as are for example C, C++,
-  Objective C, preprocessed assembler ...).  One should just use
-  $(AM_CPPFLAGS) instead, which has been supported and recommended for
-  a long time.
-
-* Support for DJGPP, Windows 95/98/ME and MS-DOS has been removed.
-  Of course, MinGW/MSYS and Cygwin on Windows 2000 and later are still
-  fully supported.
-
-* Automake-generated Makefiles assume the target systems always support
-  file names starting with a dot; accordingly, the internal m4 macro
-  'AM_SET_LEADING_DOT' and AC_SUBST'd variable 'am__leading_dot' have
-  been removed.
-
 * The Automake-defined internal make variable '$(ACLOCAL_M4)' has been
   renamed to '$(am.remake.aclocal-m4)', and should be considered an
   internal detail.
diff --git a/aclocal.in b/aclocal.in
index 859f71b..35b632a 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -77,7 +77,7 @@ my @diff_command;
 # --dry-run
 my $dry_run = 0;
 
-# Name of the Autoconf input file.  We used to support configure.in
+# Name of the Autoconf input file.  We used to support 'configure.in'
 # as well once, that that is long obsolete now.
 my $configure_ac = 'configure.ac';
 
@@ -992,7 +992,7 @@ sub usage ($)
   print <<'EOF';
 Usage: aclocal [OPTION]...
 
-Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in'
+Generate 'aclocal.m4' by scanning 'configure.ac'
 
 Options:
       --automake-acdir=DIR  directory holding automake-provided m4 files
diff --git a/automake.in b/automake.in
index 7d431e9..5435be6 100644
--- a/automake.in
+++ b/automake.in
@@ -305,7 +305,7 @@ my $force_missing = 0;
 ## Variables filled during files scanning.  ##
 ## ---------------------------------------- ##
 
-# Name of the Autoconf input file.  We used to support configure.in
+# Name of the Autoconf input file.  We used to support 'configure.in'
 # as well once, that that is long obsolete now.
 my $configure_ac = 'configure.ac';
 
@@ -3348,10 +3348,12 @@ sub scan_aclocal_m4 ()
       $regen_aclocal = $line =~ 'generated automatically by aclocal';
     }
 
+  reject_var ('ACLOCAL_M4_SOURCES',
+             "'ACLOCAL_M4_SOURCES' is obsolete; just remove it");
+
   # Note that it might be possible that aclocal.m4 doesn't exist but
   # should be auto-generated.  This case probably isn't very
   # important.
-
   return $regen_aclocal;
 }
 
@@ -3491,7 +3493,7 @@ sub handle_configure ($@)
   my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
   my $regen_aclocal_m4 = scan_aclocal_m4;
   define_variable ('am.remake.aclocal-m4-deps', INTERNAL,
-                   @configure_deps, '$(top_srcdir)/' . $configure_ac);
+                   @configure_deps, "\$(top_srcdir)/$configure_ac");
   my @configuredeps = ('$(am.remake.aclocal-m4-deps)',
                        '$(CONFIGURE_DEPENDENCIES)');
   push @configuredeps, '$(am.remake.aclocal-m4)' if -f 'aclocal.m4';
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 50a4dad..3d88556 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -187,7 +187,6 @@ my %_ac_macro_for_var =
    YACC => 'AC_PROG_YACC',
    );
 
-# The name of the configure.ac file.
 my $configure_ac = 'configure.ac';
 
 # Variables that can be overridden without complaint from -Woverride
diff --git a/old/TODO b/old/TODO
index f8e4754..fcd8a58 100644
--- a/old/TODO
+++ b/old/TODO
@@ -233,7 +233,7 @@ characters long.
 *    Make sure that all the files in the distribution are world-readable.
 
 should be able to determine what is built by looking at rules (and
-configure.in).  Then built man pages (eg) could automatically be
+configure.ac).  Then built man pages (eg) could automatically be
 omitted from the distribution.
 
 Right now, targets generated internally (eg "install") are not
@@ -445,7 +445,7 @@ consider auto-including any file that matches "*.in".
 must look at mkid to see how it works (for subdir usage)
   [ right now, it doesn't.  i don't see a simple fix right now ]
 
-if configure.in not found, move up a directory and try again?  This
+if configure.ac not found, move up a directory and try again?  This
 could eliminate a common source of problems.
   [ this is just a bad idea ]
 
diff --git a/syntax-checks.mk b/syntax-checks.mk
index eaae627..1231d6b 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -558,6 +558,17 @@ sc_m4_am_plain_egrep_fgrep:
          exit 1; \
        fi
 
+## Use 'configure.ac', not the obsolete 'configure.in', as the name
+## for configure input files in our testsuite.  The latter  has been
+## deprecated for several years (at least since autoconf 2.50) and
+## support for it will be removed in Automake 1.14.
+sc_tests_no_configure_in:
+       @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs); then \
+         echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
+         echo "for configure input files in the test cases above." >&2; \
+         exit 1; \
+       fi
+
 ## Rule to ensure that the testsuite has been run before.  We don't depend
 ## on 'check' here, because that would be very wasteful in the common case.
 ## We could run "make check AM_LAZY_CHECK=yes" and avoid toplevel races with
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index b99321a..508bdab 100755
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Backward-compatibility test: try to build and distribute a package
-# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT,
-# and 'configure.in' as autconf input file.
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
 # This script can also serve as mild stress-testing for Automake.
 # See also the similar test 'backcompat5.test'.
 
diff --git a/t/help.sh b/t/help.sh
index 961fcea..f27d8b1 100755
--- a/t/help.sh
+++ b/t/help.sh
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure --help and --version work, even when no configure.ac nor
-# configure.in is in the current directory.
+# Make sure --help and --version work, even when no configure.ac is in
+# the current directory.
 
 . test-init.sh
 
@@ -33,8 +33,7 @@ $ACLOCAL --help
 $AUTOMAKE --version
 $AUTOMAKE --help
 
-# Sanity checks: aclocal and automake cannot work without configure.ac
-# nor configure.in.
+# Sanity checks: aclocal and automake cannot work without configure.ac.
 $ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
 cat stderr >&2
 $FGREP configure.ac stderr


hooks/post-receive
-- 
GNU Automake