From: Stefano Lattarini Date: Fri, 25 May 2012 12:50:05 +0000 (+0200) Subject: Merge branch 'am-init-automake' X-Git-Tag: v1.12b~139 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52062eb2e135838f946a34e2773a70a02d243d50;p=thirdparty%2Fautomake.git Merge branch 'am-init-automake' * am-init-automake: init: obsolete usages of AM_INIT_AUTOMAKE not supported anymore Signed-off-by: Stefano Lattarini --- 52062eb2e135838f946a34e2773a70a02d243d50 diff --cc NEWS index 82e52ecec,a673ee808..6d83ac536 --- a/NEWS +++ b/NEWS @@@ -1,25 -1,32 +1,28 @@@ New in 1.13: +* Version requirements: + + - Autoconf 2.65 or greater is required. + * Obsolete features removed: + - Use of the long-deprecated two- and three-arguments invocation forms + of the AM_INIT_AUTOMAKE is not supported anymore. + -New in 1.12.1: - -* WARNING: Future backward-incompatibilities! - - - Autoconf 2.65 or later will be required by the next major Automake - version (1.13). Until now, Automake has required Autoconf version - 2.62 or later. + - Support for the "Cygnus-style" trees (once enabled by the 'cygnus' + option) has been removed. See discussion about automake bug#11034 + for more background. - - Starting from the next major Automake version (1.13), the rules to - build pdf, ps and dvi output from Texinfo input will use the '--tidy' - option by default. Since such an option was introduced in Texinfo - 4.9, this means that Makefiles generated by future Automake versions - will require at least that version of Texinfo. + - 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. - - Starting from the next major Automake version (1.13), the parallel - testsuite harness (previously only enabled by the 'parallel-tests' - option) will become the default one; the older serial testsuite - harness will still be available through the use of the 'serial-tests' - option. + - 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). - - The following long-obsolete m4 macros will be removed in the - next major Automake version (1.13): + - The following long-obsolete m4 macros have been removed: AM_PROG_CC_STDC: superseded by AC_PROG_CC since October 2002 fp_PROG_CC_STDC: broken alias for AM_PROG_CC_STDC diff --cc m4/init.m4 index 221aacf27,151a59c62..6fb8beec9 --- a/m4/init.m4 +++ b/m4/init.m4 @@@ -6,24 -6,15 +6,15 @@@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # serial 21 -# serial 20 ++# serial 22 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) - # ----------------------------------------------- - # The call with PACKAGE and VERSION arguments is the old style - # call (pre autoconf-2.50), which is being phased out. PACKAGE - # and VERSION should now be passed to AC_INIT and removed from - # the call to AM_INIT_AUTOMAKE. - # We support both call styles for the transition. After - # the next Automake release, Autoconf can make the AC_INIT - # arguments mandatory, and then we can depend on a new Autoconf - # release and drop the old call support. + # --------------------------- AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl