From: Stefano Lattarini Date: Fri, 23 Dec 2011 12:41:11 +0000 (+0100) Subject: Merge branch 'maint' into msvc X-Git-Tag: v1.11.2b~12^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54af9ca84664208507afed2ee2707145b2d2890a;p=thirdparty%2Fautomake.git Merge branch 'maint' into msvc * maint: (56 commits) tests: fix failure due to debugging code forgotten into a test tests: avoid spurious failure of libtool and gettext tests hacking: distribute it, and mention it in the ChangeLog regex: deprecate the obsolete macro AM_WITH_REGEX maint: distribute .xz tarballs, not .bz2 ones maint: better use of autoconf 2.68 features cosmetics: use proper m4 quoting in configure.ac include: avoid "deleted .am file" problem tests: better handling of gettext and libtool requirements fix: typos and grammaros in comments of the new test tests: report useful system information in 'test-suite.log' python: remove relics for Python 1.5 support configure: remove extraneous 'eval's from AM_RUN_LOG invocations configure: report TeX version in config.log maint: snapshots from `maint' are still development snapshots configure: print proper message for test releases devel: help in comparing Makefile.in from different commits repo: don't commit generated files in the git repository anymore maint: remove executable bit from automake.in missing: don't try to re-run tar with a munged command line ... --- 54af9ca84664208507afed2ee2707145b2d2890a diff --cc NEWS index 92f3d8c28,db448a913..8c5d8973e --- a/NEWS +++ b/NEWS @@@ -27,9 -37,11 +37,14 @@@ New in 1.11.0a - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. + - You may adjust the compression options used in dist-xz and dist-bzip2. + The default is now merely -e for xz, but still -9 for bzip; you may + specify a different level via the XZ_OPT and BZIP2 envvars respectively. + E.g., "make dist-xz XZ_OPT=-7" or "make dist-bzip2 BZIP2=-5" + + - The `compile' script now converts some options for MSVC for a better + user experience. Similarly, the new `ar-lib' script wraps Microsoft lib. + - The py-compile script now accepts empty arguments passed to the options `--destdir' and `--basedir', and complains about unrecognized options. Moreover, a non-option argument or a special `--' argument terminates @@@ -40,14 -52,9 +55,14 @@@ the developer-reserved makefile variable AM_DISTCHECK_CONFIGURE_FLAGS, instead of the old DISTCHECK_CONFIGURE_FLAGS. The DISTCHECK_CONFIGURE_FLAGS variable should now be reserved for the - user; still, the old Makefile.am files that used to define it should + user; still, the old Makefile.am files that used to define it will still continue to work as before. + - New macro AM_PROG_AR that looks for an archiver and wraps it in the new + 'ar-lib' auxiliary script if the selected archiver is Microsoft lib. + This new macro is required for LIBRARIES and LTLIBRARIES when automake + is run with -Wextra-portability (or -Wall) and -Werror. + - When using DejaGnu-based testsuites, the user can extend the `site.exp' file generated by automake-provided rules by defining the special make variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'. diff --cc automake.in index edfa7e975,309eadefe..c61e6c3b9 mode 100755,100644..100644 --- a/automake.in +++ b/automake.in diff --cc lib/depcomp index 9825d56d7,5621fd4df..bd0ac0895 --- a/lib/depcomp +++ b/lib/depcomp @@@ -1,10 -1,10 +1,10 @@@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects - scriptversion=2011-04-16.09; # UTC + scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011, -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by