From: Stefano Lattarini Date: Thu, 3 Nov 2011 10:37:30 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~102 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a778e9e1dcf606c9cee31009c982daa748438b39;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: maint-mode: fix botched configure messages fix: regenerate Makefiles info: allow user to inhibit creation/update of '${infodir}/dir' --- a778e9e1dcf606c9cee31009c982daa748438b39 diff --cc NEWS index c64596265,fe1dc9729..3852abfab --- a/NEWS +++ b/NEWS @@@ -75,11 -44,11 +75,15 @@@ New in 1.11a file generated by automake-provided rules by defining the special make variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'. + - The `install-info' rule can now be instructed not to create/update + the `${infodir}/dir' file, by exporting the new environment variable + `AM_UPDATE_INFO_DIR' to the value "no". + -Bugs fixed in 1.11.0a: + - Support for automatic de-ANSI-fication has been removed. + +Bugs fixed in 1.11a: + + - Lots of minor bugfixes. * Bugs introduced by 1.11: diff --cc m4/maintainer.m4 index 0d0bf7f3b,085e96cdf..b8f02bddb --- a/m4/maintainer.m4 +++ b/m4/maintainer.m4 @@@ -22,14 -22,13 +22,14 @@@ AC_DEFUN([AM_MAINTAINER_MODE] [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) - AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE