[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-33-g1564671

[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=1564671026d62a31e6194162b0c3d3e5f424b2f5

The branch, master has been updated
       via  1564671026d62a31e6194162b0c3d3e5f424b2f5 (commit)
       via  0842c52351b512e1b67ae35afb39de9e0b893418 (commit)
       via  d6294a1283a3d88665ca9ec1592e959517172e59 (commit)
       via  d8a5518d6deedbd6cbbce9213c897e836783f44b (commit)
       via  d3303684e6f05d550b4bec305b6a8650bb0ebfb9 (commit)
       via  807f3cf63a223f1d7eb6b06c02ec0abb1d4486ae (commit)
       via  8a1c64fec9c31ea0145f576e8fce7c2c7140d701 (commit)
       via  7a1eb9ff9027929687f12905e131f6fda3fa6d0c (commit)
       via  b4653256c2210d721e603023220e6fe05277286b (commit)
      from  83249bd36c0cd76d80addc8bc0ab5db565635316 (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 1564671026d62a31e6194162b0c3d3e5f424b2f5
Merge: 0842c52 8a1c64f
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 29 22:45:00 2012 +0200

    Merge branch 'mkdirp-remove' into master
    
    * mkdirp-remove:
      AM_PROG_MKDIR_P: remove as obsolete
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 0842c52351b512e1b67ae35afb39de9e0b893418
Merge: d8a5518 d6294a1
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 29 22:43:27 2012 +0200

    Merge branch 'maint'
    
    * maint:
      AM_PROG_MKDIR_P: deprecate, to be removed in Automake 1.13
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit d8a5518d6deedbd6cbbce9213c897e836783f44b
Merge: 83249bd d330368
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 29 22:32:20 2012 +0200

    Merge branch 'maint'
    
    * maint:
      tests: root can write on files without write perms; cater for this
      tests: require lex, not yacc, in a lex test case
      maint: fix a comment typo

commit 8a1c64fec9c31ea0145f576e8fce7c2c7140d701
Author: Stefano Lattarini <address@hidden>
Date:   Fri Apr 6 11:24:11 2012 +0200

    AM_PROG_MKDIR_P: remove as obsolete
    
    Support for the obsolescent 'AM_PROG_MKDIR_P' m4 macro (and its
    output variable '$(mkdir_p)') has in the documentation and with
    runtime warning since Automake 1.12.1.  It's now time to remove it.
    
    * automake.in (scan_autoconf_traces): Remove special handling of
    'AM_PROG_MKDIR_P'.
    * m4/mkdirp.m4: Delete.
    * Makefile.am (dist_automake_ac_DATA): Remove it.
    * t/mkdirp-deprecation.sh: Delete.
    * t/list-of-tests.mk: Remove it.
    * doc/automake.texi: Remove references to the 'AM_MKDIR_P' m4 macro
    and the '$(mkdir_p)' output variable.
    * t/gettext-macros.sh: Ensure the gettext-requiring tests will
    still see the now-removed 'AM_PROG_MKDIR_P' macro as an alias for
    the 'AC_PROG_MKDIR_P' macro, since even recent versions of gettext
    uses 'AM_PROG_MKDIR_P' in their '.m4' files.
    * NEWS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 Makefile.am         |    1 -
 NEWS                |   21 ++++++++++++++++-----
 configure.ac        |    2 +-
 m4/init.m4          |    2 +-
 m4/mkdirp.m4        |   28 ----------------------------
 syntax-checks.mk    |    7 -------
 t/dist-readonly.sh  |    4 +++-
 t/gettext-macros.sh |   12 ++++++++----
 t/lex-clean.sh      |    2 +-
 9 files changed, 30 insertions(+), 49 deletions(-)
 delete mode 100644 m4/mkdirp.m4

diff --git a/Makefile.am b/Makefile.am
index 495a02a..5fb8fe3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -276,7 +276,6 @@ dist_automake_ac_DATA = \
   m4/make.m4 \
   m4/minuso.m4 \
   m4/missing.m4 \
-  m4/mkdirp.m4 \
   m4/options.m4 \
   m4/protos.m4 \
   m4/python.m4 \
diff --git a/NEWS b/NEWS
index 8653603..e937542 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ New in 1.13:
 
 * Obsolete features removed:
 
+  - The automake-provided $(mkdir_p) make variable, @mkdir_p@ configure
+    time substitution and AM_PROG_MKDIR m4 macro have been removed.  They
+    had been obsolete since automake 1.10, and actively deprecated since
+    Automake 1.12.1.
+
   - The deprecated aclocal option '--acdir' has been removed.  You
     should use the options '--automake-acdir' and '--system-acdir'
     instead (which have been introduced in Automake 1.11.2).
@@ -24,6 +29,17 @@ New in 1.13:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+New in 1.12.1:
+
+* Deprecated obsolescent features:
+
+  - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
+    variable, @mkdir_p@ configure-time substitution and AM_PROG_MKDIR
+    m4 macro are deprecated, eliciting a warning in the 'obsolete'
+    category.  They will be removed in the next major version (1.13).
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.12:
 
 * WARNING: Future backward-incompatibilities!
@@ -48,11 +64,6 @@ New in 1.12:
     AM_INIT_AUTOMAKE macro will be deprecated in the next minor version
     of Automake (1.12.1) and removed in the next major version (1.13).
 
-  - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
-    variable, @mkdir_p@ substitution and AM_PROG_MKDIR m4 macro will
-    all be deprecated in the next minor version of Automake (1.12.1)
-    and removed in the next major version (1.13).
-
   - The exact order in which the directories in the aclocal macro
     search path are looked up is probably going to be changed in the
     next Automake release (1.13).
diff --git a/configure.ac b/configure.ac
index b671227..6c4208a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
                  parallel-tests silent-rules no-define no-dependencies])
 
 ## Keep this on a line of its own, since it must be found and processed
-## by the 'update-copyright' rule in out Makefile.
+## by the 'update-copyright' rule in our Makefile.
 RELEASE_YEAR=2012
 AC_SUBST([RELEASE_YEAR])
 
diff --git a/m4/init.m4 b/m4/init.m4
index 6a69244..3520dcb 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -78,7 +78,7 @@ AM_MISSING_PROG([AUTOHEADER], [autoheader])
 AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
deleted file mode 100644
index 2d88b92..0000000
--- a/m4/mkdirp.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-##                                                          -*- Autoconf -*-
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for 'mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 4d5ab6f..130d469 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -76,7 +76,6 @@ sc_tests_no_configure_in \
 sc_tests_PATH_SEPARATOR \
 sc_tests_logs_duplicate_prefixes \
 sc_tests_makefile_variable_order \
-sc_mkdir_p \
 sc_perl_at_substs \
 sc_unquoted_DESTDIR \
 sc_tabs_in_texi \
@@ -545,12 +544,6 @@ sc_tests_PATH_SEPARATOR:
          exit 1; \
        fi
 
-sc_mkdir_p:
-       @if grep 'mkdir_p' $(srcdir)/automake.in $(ams) $(xtests); then \
-         echo 'Do not use mkdir_p in the above files, use MKDIR_P.' 1>&2; \
-         exit 1; \
-       fi
-
 ## Try to make sure all @...@ substitutions are covered by our
 ## substitution rule.
 sc_perl_at_substs:
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
index 1aa32c8..2bf2a6d 100755
--- a/t/dist-readonly.sh
+++ b/t/dist-readonly.sh
@@ -17,7 +17,9 @@
 # Test that a readonly files are distributed as such, and not make
 # writable while being copied in the $(distdir).
 
-required=cc
+# This test expect the user to be unable to write on files lacking
+# write permissions -- so it won't work if the user is 'root'.
+required='non-root cc'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 8adcb0d..e9a4739 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -61,10 +61,7 @@ AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([$autopoint_version])
 END
 
-if $am_gettextize_command --force && test -f m4/gettext.m4; then
-  echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
-  echo "export ACLOCAL_PATH" >> get.sh
-else
+if $am_gettextize_command --force && test -f m4/gettext.m4; then :; else
   # Older versions of gettext might not have a gettextize program
   # available, but this doesn't mean the user hasn't made the gettext
   # macros available, e.g., by properly setting ACLOCAL_PATH.
@@ -78,6 +75,13 @@ else
   fi
 fi
 
+echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
+echo "export ACLOCAL_PATH" >> get.sh
+
+# Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P'
+# m4 macro.  So we need the following to avoid spurious errors.
+echo 'AC_DEFUN([AM_MKDIR_P], [AC_MKDIR_P(address@hidden)])' >> m4/mk-dirp.m4
+
 . ./get.sh
 
 $ACLOCAL --force -I m4 || cat >> get.sh <<'END'
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 9b23f01..4213195 100755
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -19,7 +19,7 @@
 # distributed .l sources are cleaned by "make maintainer-clean".
 # See also sister test 'lex-clean-cxx.test'.
 
-required=yacc
+required=lex
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'


hooks/post-receive
-- 
GNU Automake