diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-29 22:35:16 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-29 22:35:16 +0200 |
| commit | d6294a1283a3d88665ca9ec1592e959517172e59 (patch) | |
| tree | 085908b95b05b51e442c3661c29d1cafed3695d9 /m4 | |
| parent | d3303684e6f05d550b4bec305b6a8650bb0ebfb9 (diff) | |
| parent | 7a1eb9ff9027929687f12905e131f6fda3fa6d0c (diff) | |
| download | automake-d6294a1283a3d88665ca9ec1592e959517172e59.tar.gz | |
Merge branch 'mkdirp-deprecate' into maint
* mkdirp-deprecate:
AM_PROG_MKDIR_P: deprecate, to be removed in Automake 1.13
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/init.m4 | 2 | ||||
| -rw-r--r-- | m4/mkdirp.m4 | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index 6a6924465..3520dcb77 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 index 2d88b92a7..d362b0b95 100644 --- a/m4/mkdirp.m4 +++ b/m4/mkdirp.m4 @@ -5,7 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_PROG_MKDIR_P # --------------- @@ -13,6 +13,11 @@ AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME to be removed in Automake 1.13. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) 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. |