diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-21 14:52:37 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-21 14:52:37 +0100 |
| commit | 63fe125a2e835955b8d0ba0d658208ebf63285f2 (patch) | |
| tree | 1002e7bc6bb45278c061b21f89756d0599988d73 /m4 | |
| parent | 2c0fe206d94f1b2a8ee4d40e5b1841d003fd7319 (diff) | |
| parent | 655e268ddfae52ec1eef5558f95cd1c72c362649 (diff) | |
| download | automake-63fe125a2e835955b8d0ba0d658208ebf63285f2.tar.gz | |
Merge branch 'branch-1.13.2' into maint
That branch is for the "emergency" bug-fixing release 1.13.2.
* branch-1.13.2:
maint: update copyright in files generated by automake and aclocal
tests: avoid a spurious failure when running inside Emacs
tests: make two new test executable
m4: rename an m4 file to a more appropriate name
NEWS: update w.r.t. recent documentation fixes
compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC
docs: parallel-tests is no longer experimental
docs: serial-tests are not deprecated, just discouraged
NEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/obsolete.m4 (renamed from m4/obsolete-err.m4) | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/m4/obsolete-err.m4 b/m4/obsolete.m4 index d8119a4e4..f7ec1dbcd 100644 --- a/m4/obsolete-err.m4 +++ b/m4/obsolete.m4 @@ -8,19 +8,21 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -dnl TODO: Remove in Automake 1.15. AC_DEFUN([AM_CONFIG_HEADER], -[AC_FATAL(['$0': this macro is obsolete. - You should use the 'AC][_CONFIG_HEADERS' macro instead.])]) +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) -dnl TODO: Remove in Automake 1.15. AC_DEFUN([AM_PROG_CC_STDC], -[AC_FATAL(['$0': this macro is obsolete. - You should simply use the 'AC][_PROG_CC' macro instead. - Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', - but upon 'ac_cv_prog_cc_stdc'.])]) +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) -dnl TODO: Remove in Automake 1.14. AC_DEFUN([AM_C_PROTOTYPES], [AC_FATAL([automatic de-ANSI-fication support has been removed])]) AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) |