]> git.ipfire.org Git - thirdparty/autoconf.git/log
thirdparty/autoconf.git
15 years agoMention another line-counting alternative.
Eric Blake [Thu, 20 May 2010 21:07:03 +0000 (15:07 -0600)] 
Mention another line-counting alternative.

GCS lists sed but not wc as a portable app for Makefile.

* doc/autoconf.texi (Limitations of Usual Tools) <grep>: Mention
how to use sed to count lines.
Suggested by Paolo Bonzini.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoDocument the grep workaround.
Eric Blake [Wed, 12 May 2010 14:38:57 +0000 (08:38 -0600)] 
Document the grep workaround.

* doc/autoconf.texi (Limitations of Usual Tools) <grep>: Document
the bug.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoWork around QNX4 grep bug.
Mark Hessling [Wed, 12 May 2010 14:35:00 +0000 (08:35 -0600)] 
Work around QNX4 grep bug.

* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Count ^
rather than $ to avoid QNX4 grep bug.
* THANKS: Update.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoImprove Erlang documentation.
David Reiss [Tue, 11 May 2010 18:10:36 +0000 (11:10 -0700)] 
Improve Erlang documentation.

* doc/autoconf.texi (Erlang Libraries): Document actual default
values.
* THANKS: Update.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoFix typo in previous patch.
Eric Blake [Tue, 11 May 2010 20:13:32 +0000 (14:13 -0600)] 
Fix typo in previous patch.

* doc/autoconf.texi (File Descriptors): Add end '.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoMention how to silence program probes.
Eric Blake [Tue, 11 May 2010 14:00:56 +0000 (08:00 -0600)] 
Mention how to silence program probes.

* doc/autoconf.texi (File Descriptors): Document how to silence a
program probe.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoError and warning message formatting cleanups.
Ralf Wildenhues [Sun, 25 Apr 2010 15:02:47 +0000 (17:02 +0200)] 
Error and warning message formatting cleanups.

* doc/autoconf.texi (Autoconf Language, Generic Structures):
Do not capitalize the first word in error messages, do not end
them with a period.
* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS, AC_MSG_FAILURE):
Likewise.
* lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Likewise.
* lib/autotest/general.m4 (AT_INIT, at_fn_group_prepare):
Likewise.
* m4/m4.m4 (AC_PROG_GNU_M4): Likewise.
* tests/base.at (AC_TRY_COMMAND): Likewise.
* tests/torture.at (datarootdir workaround): Adjust expected
message.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix placing of ellipses in English text.
Ralf Wildenhues [Sun, 25 Apr 2010 12:19:13 +0000 (14:19 +0200)] 
Fix placing of ellipses in English text.

* lib/autoconf/general.m4 (_AC_INIT_HELP): Be sure to add a
space before `...' in natural language text.
* lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL_BODY):
Likewise.
* lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Likewise.
* lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Likewise.
* tests/suite.at: Likewise.
* tests/torture.at (@%:@define header templates): Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoEnsure autotest tests have an atconfig file, for testsuite -v.
Ralf Wildenhues [Sun, 25 Apr 2010 12:18:19 +0000 (14:18 +0200)] 
Ensure autotest tests have an atconfig file, for testsuite -v.

* tests/autotest.at (AT_CHECK_AT_PREP): Create a default
atconfig file in the directory of the testsuite.
(AT_CHECK_AT_TITLE): Also check that `./micro-suite -v' output
does not contain empty $at_srcdir expansion.
(srcdir propagation): Remove the atconfig file generated by
AT_CHECK_AT_PREP.  Check each suite invocation for $at_srcdir
expansion.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix autotest testsuite -v output to print test group title.
Ralf Wildenhues [Sun, 25 Apr 2010 12:17:27 +0000 (14:17 +0200)] 
Fix autotest testsuite -v output to print test group title.

* lib/autotest/general.m4 (AT_CLEANUP): Actually print test
title in verbose output.  Fixes AUTOCONF-2.57-101-gc102ed8
regression.
* tests/autotest.at (AT_CHECK_AT_TITLE): Amend macro to check
for test title in -v output.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoClarify octal escapes with tr.
Eric Blake [Mon, 26 Apr 2010 15:30:06 +0000 (09:30 -0600)] 
Clarify octal escapes with tr.

* doc/autoconf.texi (Limitations of Usual Tools): Carriage return
is portable in octal, but not newline.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoAdd missing ChangeLog entry.
Eric Blake [Thu, 22 Apr 2010 18:01:33 +0000 (12:01 -0600)] 
Add missing ChangeLog entry.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoAdd a paragraph to FAQ on Debugging configure scripts.
Joel James Adamson [Thu, 22 Apr 2010 14:53:20 +0000 (10:53 -0400)] 
Add a paragraph to FAQ on Debugging configure scripts.

* doc/autoconf.texi (Debugging): Mention inspecting config.log.
* THANKS: Update.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agomanual: fix minor typo in AC_CONFIG_SUBDIRS example
Mike Frysinger [Wed, 21 Apr 2010 09:20:45 +0000 (05:20 -0400)] 
manual: fix minor typo in AC_CONFIG_SUBDIRS example

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoFix m4_cr_all for EBCDIC.
Eric Blake [Mon, 5 Apr 2010 14:06:17 +0000 (08:06 -0600)] 
Fix m4_cr_all for EBCDIC.

* lib/m4sugar/m4sugar.m4 (m4_cr_all): Swap * and $, so that we
don't end up with $* in EBCDIC.
* NEWS: Document the fix.
* THANKS: Update.
Reported by Steve Goetze.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoDo not use @acronym in the manual.
Ralf Wildenhues [Sun, 28 Mar 2010 15:55:44 +0000 (17:55 +0200)] 
Do not use @acronym in the manual.

* doc/autoconf.texi: Remove all usage of @acronym.
Suggested by Karl Berry.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoDo not use @sc in the manual.
Ralf Wildenhues [Sun, 28 Mar 2010 15:54:39 +0000 (17:54 +0200)] 
Do not use @sc in the manual.

* doc/autoconf.texi: Remove all usage of @sc in the manual.
Suggested by Karl Berry.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix wrong comment in testsuite.
Ralf Wildenhues [Fri, 12 Mar 2010 06:02:48 +0000 (07:02 +0100)] 
Fix wrong comment in testsuite.

* tests/m4sugar.at (m4@&t@_warn): Remove copy&pasted comment.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFormatting cleanups in macro comments.
Ralf Wildenhues [Fri, 12 Mar 2010 05:58:46 +0000 (06:58 +0100)] 
Formatting cleanups in macro comments.

For a list of candidate unaligned underlines, use this script:

for f in `git ls-files`; do
  awk '{ len[NR] = length($0) }
       /----*/ && len[NR-1] != 0 {
         if (len[NR-1] != len[NR])
           print FILENAME ":" NR ":" $0
       }' $f
done

* lib/autoconf/c.m4, lib/autoconf/erlang.m4,
lib/autoconf/fortran.m4, lib/autoconf/functions.m4,
lib/autoconf/general.m4, lib/autoconf/lang.m4,
lib/autoconf/programs.m4, lib/autoconf/specific.m4,
lib/autoconf/status.m4, lib/autoconf/types.m4,
lib/autotest/general.m4, lib/autotest/specific.m4,
lib/m4sugar/m4sh.m4, lib/m4sugar/m4sugar.m4,
tests/autotest.at, tests/local.at, tests/m4sh.at,
tests/semantics.at, tests/tools.at, tests/torture.at: Fix macro
comment format.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agomanual: index strings containing colon in non-info outputs.
Ralf Wildenhues [Fri, 5 Mar 2010 23:09:52 +0000 (00:09 +0100)] 
manual: index strings containing colon in non-info outputs.

* doc/autoconf.texi (Quadrigraphs, Shell Substitutions): Produce
index entries for concepts containing a colon in output formats
other than info.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoUpdate copyright years for files generated by mktests.sh.
Ralf Wildenhues [Fri, 5 Mar 2010 23:08:58 +0000 (00:08 +0100)] 
Update copyright years for files generated by mktests.sh.

* tests/mktests.sh: Update copyright years for generated files.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoDocument AC_LANG_CONFTEST semantic change.
Eric Blake [Tue, 2 Mar 2010 22:46:34 +0000 (15:46 -0700)] 
Document AC_LANG_CONFTEST semantic change.

* doc/autoconf.texi (Generating Sources) <AC_LANG_CONFTEST>:
Enhance documentation, to show that semantic change in 2.63b was
intentional.
* THANKS: Update.
Reported by Brian J. Murrell, analyzed by Ralf Wildenhues.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoAutoconf Macro Archive URL has changed.
Peter Johansson [Thu, 4 Mar 2010 04:13:22 +0000 (23:13 -0500)] 
Autoconf Macro Archive URL has changed.

* doc/autoconf.texi (Introduction, Coding Style, Defining
Directories): The Autoconf Macro Archive is officially `GNU'.
Update URL.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoFix shell code in AS_TR_SH documentation.
Eric Blake [Tue, 2 Mar 2010 22:39:58 +0000 (15:39 -0700)] 
Fix shell code in AS_TR_SH documentation.

* doc/autoconf.texi (Common Shell Constructs) <AS_TR_SH>: Fix
example to expand to valid shell code.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoImprove documentation on AC_{COMPILE,LINK}_IFELSE.
Eric Blake [Tue, 2 Mar 2010 21:00:24 +0000 (14:00 -0700)] 
Improve documentation on AC_{COMPILE,LINK}_IFELSE.

* doc/autoconf.texi (Running the Compiler): Mention that the
object file is available after a successful compile.
(Running the Linker): Likewise for the linker output.
Suggested by Paolo Bonzini.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoFix typo in docs.
Eric Blake [Tue, 2 Mar 2010 19:15:56 +0000 (12:15 -0700)] 
Fix typo in docs.

* doc/autoconf.texi (Conditional constructs) <m4_ifblank>: Fix
typo.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoFix AS_ERROR for FreeBSD sh.
Ralf Wildenhues [Tue, 2 Mar 2010 19:19:32 +0000 (20:19 +0100)] 
Fix AS_ERROR for FreeBSD sh.

* lib/m4sugar/m4sh.m4 (_AS_ERROR_PREPARE): Rewrite as_fn_error
to take additional first argument STATUS instead of transporting
$? across shell function entry, which does not work with FreeBSD
sh.  Shift all other arguments by one, adjust.
(AS_ERROR): Pass EXIT-STATUS, defaulting to $?, to as_fn_error.
Report by Václav Haisman.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix `autom4te cache creation' testsuite failure on FreeBSD.
Ralf Wildenhues [Tue, 2 Mar 2010 06:50:19 +0000 (07:50 +0100)] 
Fix `autom4te cache creation' testsuite failure on FreeBSD.

* tests/tools.at (autom4te cache creation): Normalize exit
status of failed redirection to 1, may be 2 with FreeBSD sh.
* THANKS: Update.
Report by Václav Haisman.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix Autotest tracing of shell pipelines for FreeBSD sh.
Ralf Wildenhues [Tue, 2 Mar 2010 06:48:42 +0000 (07:48 +0100)] 
Fix Autotest tracing of shell pipelines for FreeBSD sh.

* lib/autotest/general.m4 (_AT_DECIDE_TRACEABLE): Do not trace
commands that contain [^|]|[^|], a likely shell pipeline.
* tests/local.at (_AT_CHECK_ENV): Turn off tracing for egrep |
grep pipeline.
* doc/autoconf.texi (File Descriptors): Document limitation.
* tests/autotest.at (Trace output): New test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoUpdate file flow diagram to mention Automake.
Eric Blake [Thu, 25 Feb 2010 22:49:12 +0000 (15:49 -0700)] 
Update file flow diagram to mention Automake.

* doc/autoconf.texi (Making configure Scripts): Avoid confusion
with listing Makefile.in twice on one line.  Add a diagram showing
how automake fits into the picture.
Reported by santilín.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoOptimize AC_REPLACE_FUNCS.
Eric Blake [Wed, 9 Sep 2009 14:32:46 +0000 (08:32 -0600)] 
Optimize AC_REPLACE_FUNCS.

* lib/autoconf/functions.m4 (_AC_REPLACE_FUNC): New helper macro.
(AC_REPLACE_FUNCS): Use it to reduce forks when checking for
replacements, by using literal rather than shell variable.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoDocument how to safely override CFLAGS default.
Eric Blake [Thu, 25 Feb 2010 21:56:34 +0000 (14:56 -0700)] 
Document how to safely override CFLAGS default.

* doc/autoconf.texi (C Compiler) <AC_PROG_CC>: Document a way to
change the default CFLAGS.
(C++ Compiler) <AC_PROG_CXX>: Likewise, for CXXFLAGS.
Reported by Monty Taylor; wording suggested by Paolo Bonzini.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoDocument that Autoconf relies on IFS.
Eric Blake [Thu, 25 Feb 2010 21:06:38 +0000 (14:06 -0700)] 
Document that Autoconf relies on IFS.

* doc/autoconf.texi (Special Shell Variables) <IFS>: Add details
about use of IFS within configure script.
* THANKS: Update.
Reported by Arkadiusz Miskiewicz.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoRecommend latest m4 release.
Eric Blake [Thu, 25 Feb 2010 21:17:31 +0000 (14:17 -0700)] 
Recommend latest m4 release.

* README: Bump recommendation to m4 1.4.14 (minimum remains
1.4.6).
* doc/autoconf.texi (Introduction): Likewise.
* m4/m4.m4 (AC_PROG_GNU_M4): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
15 years agoFix testsuite failures due to setting of $U.
Ralf Wildenhues [Tue, 23 Feb 2010 05:53:09 +0000 (06:53 +0100)] 
Fix testsuite failures due to setting of $U.

* tests/local.at (_AT_CHECK_ENV): Ignore setting of $U.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoAvoid uninitialized use of $U.
Eric Blake [Tue, 9 Feb 2010 13:22:59 +0000 (06:22 -0700)] 
Avoid uninitialized use of $U.

Automake sets up $U in AM_C_PROTOTYPES, but we can't assume that
automake is always in use.

* lib/autoconf/general.m4 (_AC_LIBOBJS_NORMALIZE): Ensure $U is
set if automake did not define it.
* THANKS: Update.
Reported by Heiko Schlichting, via Julien Élie.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoFix substitution of carriage return on Darwin.
Ralf Wildenhues [Sun, 24 Jan 2010 08:33:25 +0000 (09:33 +0100)] 
Fix substitution of carriage return on Darwin.

* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Set
ac_cs_awk_cr to '\\r', so that sed portably expands this to '\r'
rather than a literal carriage return, to fix substitution on
Darwin.  Regression introduced in 2.63b.
Report by Peter O'Gorman.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix test failure when a shell uses $TMPDIR for here-documents.
Dmitry V. Levin [Tue, 19 Jan 2010 16:03:31 +0000 (19:03 +0300)] 
Fix test failure when a shell uses $TMPDIR for here-documents.

* tests/tools.at (autotools and whitespace in file names): Create
$TMPDIR before potential use like in other whitespace tests.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoAdd recommendation on (not) unsetting IFS.
Paolo Bonzini [Thu, 21 Jan 2010 11:16:42 +0000 (12:16 +0100)] 
Add recommendation on (not) unsetting IFS.

* doc/autoconf.texi (Special shell variables): Explain why it's
better not to unset IFS.

15 years agoconfig.status: consistent exit status with nonexistent config file input.
Ralf Wildenhues [Mon, 18 Jan 2010 19:26:22 +0000 (20:26 +0100)] 
config.status: consistent exit status with nonexistent config file input.

* lib/autoconf/status.m4 (_AC_OUTPUT_MAIN_LOOP): Ensure we
exit with status 1 rather than with that of 'false', for
reproducibility.
(AC_OUTPUT): Ensure to exit 1 in case of config.status failure.
* tests/torture.at (Missing templates): Also test code path
for $srcdir != '.'.
Report by Tim Rice.

15 years agoFix previous example.
Eric Blake [Wed, 13 Jan 2010 16:46:35 +0000 (09:46 -0700)] 
Fix previous example.

* doc/autoconf.texi (Here-Documents): Touch up the example to
match output to sample command line.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoDocument here-doc pitfall.
Eric Blake [Wed, 13 Jan 2010 13:03:07 +0000 (06:03 -0700)] 
Document here-doc pitfall.

* doc/autoconf.texi (Here-Documents): Mention problem with <<-
operator.
Reported by Jim Meyering.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoTypo fix in earlier commit.
Eric Blake [Mon, 11 Jan 2010 15:09:35 +0000 (08:09 -0700)] 
Typo fix in earlier commit.

* doc/autoconf.texi (Autoconf Language): Fix typo.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoAllow AC_FUNC_MKTIME to work with C++.
Ralf Wildenhues [Tue, 12 Jan 2010 18:43:04 +0000 (19:43 +0100)] 
Allow AC_FUNC_MKTIME to work with C++.

* lib/autoconf/functions.m4 (AC_FUNC_MKTIME): ANSIfy KnR function
definitions.  Use `const char*' for character literals; cast them
to `char*' for putenv.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoExport AUTOM4TE in tests/atlocal.in, for aclocal.
Ralf Wildenhues [Mon, 11 Jan 2010 20:39:21 +0000 (21:39 +0100)] 
Export AUTOM4TE in tests/atlocal.in, for aclocal.

* tests/atlocal.in: Set and export $AUTOM4TE, for aclocal.
Report by Tim Rice.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoMake autotest example act better with automake.
Eric Blake [Thu, 7 Jan 2010 17:58:24 +0000 (10:58 -0700)] 
Make autotest example act better with automake.

* doc/autoconf.texi (Making testsuite Scripts): Rely on automake
feature for recommended autotest snippet, following our own use.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoClarify language on handling of opening parenthesis.
Eric Blake [Fri, 8 Jan 2010 13:52:58 +0000 (06:52 -0700)] 
Clarify language on handling of opening parenthesis.

* doc/autoconf.texi (Autoconf Language): Give an example of
improper argument passing.
* THANKS: Update.
Reported by Juan Carlos Hurtado.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoDon't fail autom4te preselection test due to different Automake.
Ralf Wildenhues [Wed, 6 Jan 2010 19:26:04 +0000 (20:26 +0100)] 
Don't fail autom4te preselection test due to different Automake.

* tests/tools.at (autom4te preselections): If the cache test
fails, extract the Automake version from the toplevel
Makefile.in file of the source tree; skip, rather than fail
the test group if the automake program has a different version.
* THANKS: Update.
Report by Dieter Jurzitza, fix suggested by Eric Blake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix AC_CONFIG_LINKS to generated files when srcdir is absolute.
Peter Breitenlohner [Wed, 6 Jan 2010 19:14:53 +0000 (20:14 +0100)] 
Fix AC_CONFIG_LINKS to generated files when srcdir is absolute.

* lib/autoconf/status.m4 (_AC_OUTPUT_LINK): Check $ac_source,
not $srcdir, for being relative or absolute.
* tests/torture.at (AC_CONFIG_LINKS): New test.
(AC_CONFIG_LINKS and identical files): Extend test, avoid some
forks.
Report, patch and testcase example by Peter Breitenlohner.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoImprove release automation.
Eric Blake [Wed, 6 Jan 2010 04:31:32 +0000 (21:31 -0700)] 
Improve release automation.

* maint.mk (gnulib_dir, gnulib-version, bootstrap-tools)
(announcement): Copy from latest gnulib maint.mk.
* cfg.mk (announce_gen, gpg_key_ID): Delete.
(bootstrap-tools): Override the default.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoUpdate upstream files.
Eric Blake [Wed, 6 Jan 2010 04:13:38 +0000 (21:13 -0700)] 
Update upstream files.

* GNUmakefile: Update via 'make fetch'.
* build-aux/announce-gen: Likewise.
* build-aux/config.guess: Likewise.
* build-aux/config.sub: Likewise.
* build-aux/gendocs.sh: Likewise.
* build-aux/gnupload: Likewise.
* build-aux/move-if-change: Likewise.
* build-aux/update-copyright: Likewise.
* build-aux/vc-list-files: Likewise.
* doc/standards.texi: Likewise.
* cfg.mk (update-copyright-env): Enforce wrap column.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoUpdate copyright year.
Eric Blake [Wed, 6 Jan 2010 03:59:55 +0000 (20:59 -0700)] 
Update copyright year.

All files changed to add 2010, via 'make update-copyright'.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoImprove documentation on Solaris tr bugs.
Bruno Haible [Thu, 31 Dec 2009 13:50:44 +0000 (06:50 -0700)] 
Improve documentation on Solaris tr bugs.

* doc/autoconf.texi (Limitations of Usual Tools) <tr>: Refine
description of NUL handling by Solaris tr.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoAnother tr tweak.
Eric Blake [Thu, 31 Dec 2009 12:31:44 +0000 (05:31 -0700)] 
Another tr tweak.

* doc/autoconf.texi (Limitations of Usual Tools) <tr>: Clarify
previous commit.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoImprove documentation on tr portability.
Eric Blake [Tue, 29 Dec 2009 21:57:35 +0000 (14:57 -0700)] 
Improve documentation on tr portability.

* doc/autoconf.texi (Limitations of Usual Tools) <tr>: Refine
description of NUL handling.  Document set size issue.
Reported by Bruno Haible.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoFix comment in AC_CHECK_DECLS.
Eric Blake [Mon, 21 Dec 2009 23:47:57 +0000 (16:47 -0700)] 
Fix comment in AC_CHECK_DECLS.

* lib/autoconf/general.m4 (AC_CHECK_DECL): Document the includes
argument to the shell function.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoAdd testsuite exposure for shtool usage.
Ralf Wildenhues [Tue, 15 Dec 2009 05:52:19 +0000 (06:52 +0100)] 
Add testsuite exposure for shtool usage.

* tests/foreign.at (shtool): New test.
Report by Dmitry Grebeniuk.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoImprove wording about m4 quote characters.
Eric Blake [Sat, 12 Dec 2009 14:03:46 +0000 (07:03 -0700)] 
Improve wording about m4 quote characters.

* doc/autoconf.texi (Autoconf Language): Autoconf quote characters
come from m4sugar, not raw m4.
(Active Characters): Mention that it is m4sugar which changes
quotes from `' to [].
* THANKS: Update.
Suggested by Josef Vukovic.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoRevert "Improve AC_CONFIG_AUX_DIRS a bit." to fix shtool usage.
Ralf Wildenhues [Sat, 12 Dec 2009 07:40:14 +0000 (08:40 +0100)] 
Revert "Improve AC_CONFIG_AUX_DIRS a bit." to fix shtool usage.

* lib/autoconf/general.m4 (AC_CONFIG_AUX_DIRS): Revert test for
shtool as install script.  Regression introduced in 2.64.
* NEWS, THANKS: Update.
Report by Dmitry Grebeniuk.

This reverts commit 93d9386de9c1320afed43f1337ac5ddb2d2dcbb4.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix NEWS description for AC_FUNC_MMAP entry.
Ralf Wildenhues [Wed, 9 Dec 2009 18:53:20 +0000 (19:53 +0100)] 
Fix NEWS description for AC_FUNC_MMAP entry.

* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix 2.64 AC_TYPE_INT*_T macro body text regression.
Ralf Wildenhues [Wed, 9 Dec 2009 06:20:16 +0000 (07:20 +0100)] 
Fix 2.64 AC_TYPE_INT*_T macro body text regression.

* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
definition to prologue section, to avoid syntax error.
* NEWS, THANKS: Update.
Report by Pierre Ynard.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix `recursion' test failure.
Paolo Bonzini [Wed, 9 Dec 2009 09:23:16 +0000 (10:23 +0100)] 
Fix `recursion' test failure.

* tests/m4sugar.at (recursion): Use empty diversion, not 0.

15 years agoDocument Solaris/Heirloom sh set -e issue with command substitutions.
Stefano Lattarini [Sat, 5 Dec 2009 11:56:30 +0000 (12:56 +0100)] 
Document Solaris/Heirloom sh set -e issue with command substitutions.

* doc/autoconf.texi (Limitations of Builtins): Fix typos `set -d'
in previous example.  Document failure to honor && lists with set -e
and a command substitution in the failing command.
Report and initial patch by Stefano Lattarini against Automake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoWarn if using unnamed diversion.
Eric Blake [Wed, 25 Nov 2009 00:20:33 +0000 (17:20 -0700)] 
Warn if using unnamed diversion.

* lib/m4sugar/m4sugar.m4 (_m4_divert, m4_divert_push): Add
optional parameter, which controls warning.
(m4_divert_pop, m4_cleardivert, m4_divert_require)
(_m4_require_call): Adjust callers.
* lib/m4sugar/m4sh.m4 (AS_REQUIRE): Likewise.
* tests/m4sh.at (AT_DATA_LINENO): Avoid triggering the warning.
* tests/m4sugar.at (AT_CHECK_M4SUGAR_TEXT, m4@&t@_append)
(m4@&t@_text_wrap, recursion): Likewise.
(m4@&t@_warn, m4@&t@_divert_stack): Adjust expected output.
* tests/tools.at (autom4te and whitespace in file names)
(autoconf: the empty token): Avoid triggering the warning.
(autoconf: AC_PRESERVE_HELP_ORDER): New test.
* tests/mktests.sh (ac_exclude_list): Retire prior test.
* NEWS: Document the warning.
* doc/autoconf.texi (Redefined M4 Macros) <m4_divert>,
<m4_undivert>: Make even more explicit that using these directly
is discouraged.
(Diversion support): Further warn against improper diversion
changes.
<m4_divert_text>: Give an example of proper use.
Reported by Mike Frysinger.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agomanual: AC_SEARCH_LIBS also prepends to LIBS.
Ralf Wildenhues [Mon, 30 Nov 2009 20:37:00 +0000 (21:37 +0100)] 
manual: AC_SEARCH_LIBS also prepends to LIBS.

* doc/autoconf.texi (Libraries): Document that AC_SEARCH_LIBS
prepends to LIBS, just like AC_CHECK_LIB.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoBump m4.m4 serial number.
Paolo Bonzini [Fri, 27 Nov 2009 14:17:29 +0000 (15:17 +0100)] 
Bump m4.m4 serial number.

* m4/m4: Bump serial number to 10.

15 years agoFix m4 detection test on dash.
Harald van Dijk [Fri, 27 Nov 2009 10:54:07 +0000 (11:54 +0100)] 
Fix m4 detection test on dash.

* m4/m4 (AC_PROG_GNU_M4): Use AS_ECHO.

15 years agoFix AC_FUNC_MMAP regression with C++ compiler in 2.65.
Ralf Wildenhues [Tue, 24 Nov 2009 10:36:53 +0000 (11:36 +0100)] 
Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.

* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
for the constant string.  Cast void* to char* for assignment.
* NEWS, THANKS: Update.
Report by Michal Čihař.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoAdd pgfortran to list of Fortran 95+ compilers.
Ralf Wildenhues [Tue, 24 Nov 2009 10:13:47 +0000 (11:13 +0100)] 
Add pgfortran to list of Fortran 95+ compilers.

* lib/autoconf/fortran.m4 (_AC_F95_FC): Add pgfortran before
pgf95.
Based on report by Jeff Squyres.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix failure of test 35 when the user has a .autom4te.cfg file.
Paolo Bonzini [Sun, 22 Nov 2009 17:41:11 +0000 (18:41 +0100)] 
Fix failure of test 35 when the user has a .autom4te.cfg file.

* tests/tools.at (autom4te cache creation): Skip the test if the
user has a .autom4te.cfg file.

15 years ago./.prev-version: Record previous version: 2.65.
Eric Blake [Sat, 21 Nov 2009 14:35:34 +0000 (07:35 -0700)] 
./.prev-version: Record previous version: 2.65.

15 years agoRelease Version 2.65. v2.65
Eric Blake [Sat, 21 Nov 2009 13:19:57 +0000 (06:19 -0700)] 
Release Version 2.65.

* NEWS: Mention the release.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoPrepare for release.
Eric Blake [Sat, 21 Nov 2009 13:17:49 +0000 (06:17 -0700)] 
Prepare for release.

* build-aux/announce-gen: Sync from upstream.
* build-aux/config.guess: Likewise.
* build-aux/config.sub: Likewise.
* cfg.mk (gnu_rel_host, url_dir_list): Move...
* maint.mk: ...here, copying ideas from gnulib.
(major): Rename...
(stable): ...to this, copying gnulib.
* HACKING (release): Document changes in process.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoAvoid spurious newline in traced macros.
Eric Blake [Sat, 21 Nov 2009 13:36:35 +0000 (06:36 -0700)] 
Avoid spurious newline in traced macros.

* bin/autoreconf.in (tracing): Drop newline before parsing traced
arguments; regression from 2009-11-14.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoAllow absolute names in AT_TESTED.
Eric Blake [Fri, 20 Nov 2009 22:19:50 +0000 (15:19 -0700)] 
Allow absolute names in AT_TESTED.

* lib/autotest/general.m4 (AT_INIT) <PREPARE_TESTS>: Check for
absolute names before path walk.
* THANKS: Update.
Suggested by Allan Clark.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoFix AC_CONFIG_SUBDIRS tracing in autoreconf.
Ralf Wildenhues [Sat, 14 Nov 2009 11:40:07 +0000 (12:40 +0100)] 
Fix AC_CONFIG_SUBDIRS tracing in autoreconf.

* bin/autoreconf.in (autoreconf_current_directory): Collapse
newlines in the autoconf trace output, similar to how automake
invokes autoconf, so that newlines do not matter in the argument
to AC_CONFIG_SUBDIRS.
* tests/torture.at (Deep Package): Expose this issue in the
test.
* THANKS: Update.
Report by Nathan Schulte.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix AC_FUNC_MMAP for cygwin.
Eric Blake [Tue, 10 Nov 2009 04:45:00 +0000 (21:45 -0700)] 
Fix AC_FUNC_MMAP for cygwin.

* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Make the test more
portable: Actually check for <sys/param.h>, and only use MAP_FIXED
on an address previously returned from mmap.
* THANKS: Update.
Reported by Corinna Vinschen.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoRedocument AS_DIRNAME, even with its flaws.
Eric Blake [Thu, 5 Nov 2009 02:44:38 +0000 (19:44 -0700)] 
Redocument AS_DIRNAME, even with its flaws.

* doc/autoconf.texi (Common Shell Constructs) <AS_DIRNAME>:
Restore documenatation, since dirname mentions it.
Reported by Peter Johansson.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoUpdate upstream files.
Eric Blake [Thu, 5 Nov 2009 02:38:49 +0000 (19:38 -0700)] 
Update upstream files.

* build-aux/announce-gen: Synchronize from upstream.
* build-aux/config.guess: Likewise.
* build-aux/config.sub: Likewise.
* build-aux/gendocs.sh: Likewise.
* build-aux/git-version-gen: Likewise.
* build-aux/texinfo.tex: Likewise.
* build-aux/update-copyright: Likewise.
* doc/standards.texi: Likewise.
* lib/Autom4te/Channels.pm: Likewise.
* lib/Autom4te/Configure_ac.pm: Likewise.
* lib/Autom4te/FileUtils.pm: Likewise.
* lib/Autom4te/Struct.pm: Likewise.
* lib/Autom4te/XFile.pm: Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoCoverage for autom4te cache creation issues.
Ralf Wildenhues [Wed, 4 Nov 2009 18:42:58 +0000 (19:42 +0100)] 
Coverage for autom4te cache creation issues.

* tests/tools.at (autom4te cache creation): New test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix testsuite failures with SHELL=zsh.
Ralf Wildenhues [Tue, 3 Nov 2009 21:06:12 +0000 (22:06 +0100)] 
Fix testsuite failures with SHELL=zsh.

* tests/statesave.m4 (AC_STATE_SAVE): Ignore argv and ARGC when
comparing configure variables.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoUpdate NEWS for recent fixes.
Eric Blake [Tue, 3 Nov 2009 13:23:50 +0000 (06:23 -0700)] 
Update NEWS for recent fixes.

* NEWS: Add some entries.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoMicro-optimization of config.status substitution.
Ralf Wildenhues [Sun, 1 Nov 2009 00:04:31 +0000 (01:04 +0100)] 
Micro-optimization of config.status substitution.

* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): No need to
concatenate an empty second string, when we have exactly 148
characters to substitute.
* tests/torture.at (Substitute a 2000-byte string): Add test
exposure for runs of backslashes near the 148 character limit.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix testsuite failure on AIX 4.3.3.
Ralf Wildenhues [Sat, 31 Oct 2009 16:24:05 +0000 (17:24 +0100)] 
Fix testsuite failure on AIX 4.3.3.

* lib/autoconf/general.m4 (_AC_RUN_LOG_LIMIT): Remove conftest.err
also if it is empty.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix testsuite failure on IRIX and AIX.
Ralf Wildenhues [Sat, 31 Oct 2009 16:04:38 +0000 (17:04 +0100)] 
Fix testsuite failure on IRIX and AIX.

* tests/torture.at (Substitute and define special characters):
Double the backslash before the double-quote in
AC_DEFINE_UNQUOTED, as documented for here-documents.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix AC_OPENMP configure message for non-C compilers.
Ralf Wildenhues [Sat, 31 Oct 2009 08:20:10 +0000 (09:20 +0100)] 
Fix AC_OPENMP configure message for non-C compilers.

* lib/autoconf/lang.m4 (AC_LANG_DEFINE): Accept as additional
fourth arg the compiler variable name, defined in _AC_CC($1).
(_AC_CC): New language dispatch macro.
* lib/autoconf/erlang.m4 (AC_LANG(Erlang)): Adjust.
* lib/autoconf/fortran.m4 (AC_LANG(Fortran 77), AC_LANG(Fortran)):
Likewise.
* lib/autoconf/c.m4 (AC_LANG(C), AC_LANG(C++))
(AC_LANG(Objective C), AC_LANG(Objective C++)): Likewise.
(AC_OPENMP): Use _AC_CC instead of $CC.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix cross-manual link to gcc.
Eric Blake [Sat, 31 Oct 2009 12:57:46 +0000 (06:57 -0600)] 
Fix cross-manual link to gcc.

* doc/autoconf.texi (Portable C and C++): Provide uref rather than
xref when building for html.
Reported via Karl Berry.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoUpdate authors.
Eric Blake [Sat, 31 Oct 2009 12:39:49 +0000 (06:39 -0600)] 
Update authors.

* AUTHORS: Document recent copyright assignments.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoDo not fail OpenMP tests on systems without aclocal.
Ralf Wildenhues [Sat, 31 Oct 2009 07:46:58 +0000 (08:46 +0100)] 
Do not fail OpenMP tests on systems without aclocal.

* tests/c.at (AC_OPENMP and C, AC_OPENMP and C++): Override
`ACLOCAL=true' for autoreconf, the tests don't need aclocal.
* tests/fortran.at (AC_OPENMP and Fortran 77)
(AC_OPENMP and Fortran): Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoImprove cache variable documentation.
Bruno Haible [Sat, 31 Oct 2009 06:56:53 +0000 (07:56 +0100)] 
Improve cache variable documentation.

* doc/autoconf.texi (AC_PROG_AWK, AC_PROG_GREP, AC_PROG_EGREP,
AC_PROG_FGREP, AC_PROG_INSTALL, AC_PROG_MKDIR_P, AC_PROG_LEX,
AC_PROG_YACC, AC_CHECK_PROG, AC_CHECK_PROGS, AC_PATH_PROG,
AC_PATH_PROGS): Don't suggest to use the cache variable, only to
override it, or preferably, a non-cache variable associated with
the test.
(AC_PROG_SED): Likewise. Fix name of cache variable.
(AC_FUNC_GETMNTENT): Fix name cache variable.
(AC_FUNC_LSTAT): Fix typo.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix AC_OPENMP for Fortran (F77 and FC).
Ralf Wildenhues [Sat, 31 Oct 2009 01:24:09 +0000 (02:24 +0100)] 
Fix AC_OPENMP for Fortran (F77 and FC).

* lib/autoconf/fortran.m4 (AC_LANG_FUNC_LINK_TRY(Fortran): New.
* tests/c.at (AC_C_RESTRICT and C++, AC_OPENMP and C)
(AC_OPENMP and C++): New tests.
* tests/fortran.at (AC_OPENMP and Fortran 77)
(AC_OPENMP and Fortran): New tests.
* THANKS: Update.
Report by Bart Oldeman.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoPerl coverage convenience targets.
Ralf Wildenhues [Sat, 31 Oct 2009 01:22:04 +0000 (02:22 +0100)] 
Perl coverage convenience targets.

* Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS)
(PERL_COVER): New variables.
(check-coverage, check-coverage-run, check-coverage-report)
(clean-coverage): New phony targets.
(clean-local): Depend on clean-coverage.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix corner cases in AS_LITERAL_IF and AS_TR_SH.
Eric Blake [Wed, 28 Oct 2009 21:58:43 +0000 (15:58 -0600)] 
Fix corner cases in AS_LITERAL_IF and AS_TR_SH.

* lib/m4sugar/m4sh.m4 (AS_LITERAL_IF): Fix bug with unbalanced
parens.  Move guts...
(_AS_LITERAL_IF): into new helper.
(AS_TR_SH, AS_TR_CPP): Fix bugs with expansion of wrong macro.
Move guts...
(_AS_TR_SH, _AS_TR_SH_LITERAL, _AS_TR_SH_INDIR, _AS_TR_CPP)
(_AS_TR_CPP_LITERAL, _AS_TR_CPP_INDIR): ...into new helpers.
(AS_VAR_PUSHDEF): Hoist m4_require, by moving guts...
(_AS_VAR_PUSHDEF): ...into new helper.
* tests/m4sh.at (AS@&t@_LITERAL_IF): Enhance test.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoMinor optimizations to m4sh.
Eric Blake [Wed, 28 Oct 2009 18:21:36 +0000 (12:21 -0600)] 
Minor optimizations to m4sh.

* lib/m4sugar/m4sh.m4 (AS_VAR_IF, AS_IDENTIFIER_IF)
(AS_LITERAL_IF): Parse fewer bytes during expansion, by visiting
if-true and if-false arguments only once.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoOptimize m4_escape for common case.
Eric Blake [Wed, 28 Oct 2009 17:23:45 +0000 (11:23 -0600)] 
Optimize m4_escape for common case.

* lib/m4sugar/m4sugar.m4 (m4_escape): Don't use regex if string is
already sane, by copying from AS_LITERAL_IF.  Move guts...
(_m4_escape): ...into new helper.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoFix m4_text_wrap handling of quoted whitespace.
Eric Blake [Wed, 28 Oct 2009 14:17:27 +0000 (08:17 -0600)] 
Fix m4_text_wrap handling of quoted whitespace.

* lib/m4sugar/m4sugar.m4 (m4_escape): New macro.
(m4_text_wrap): Use it to avoid issues with embedded [ and ].
* tests/m4sugar.at (m4@&t@_text_wrap): Test it.
* NEWS: Document this.
* doc/autoconf.texi (Text processing Macros) <m4_escape>:
Likewise.
Reported by Mike Frysinger.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoMention another feature of AC_RUN_IFELSE.
Eric Blake [Wed, 28 Oct 2009 02:14:14 +0000 (20:14 -0600)] 
Mention another feature of AC_RUN_IFELSE.

* doc/autoconf.texi (Runtime) <AC_RUN_IFELSE>: Mention that
compiled test program still exists during if-true branch.
* THANKS: Update.
Reported by Stefano Lattarini, suggestion by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoPass Autom4te path down to programs that autoreconf invokes.
Paolo Bonzini [Mon, 26 Oct 2009 16:04:05 +0000 (17:04 +0100)] 
Pass Autom4te path down to programs that autoreconf invokes.

* bin/autoreconf.in (autom4te): New variable.  Export its value
as $ENV{'AUTOM4TE'}.  Suggested by Peter Johansson.
* THANKS: Update.

15 years agoFix AC_TYPE_UINT64_T on Tru64 with gcc 3.4.4.
Eric Blake [Tue, 20 Oct 2009 14:30:03 +0000 (08:30 -0600)] 
Fix AC_TYPE_UINT64_T on Tru64 with gcc 3.4.4.

* lib/autoconf/types.m4 (_AC_TYPE_UNSIGNED_INT_BODY)
(_AC_TYPE_INT_BODY): Avoid undefined behavior of attempting shift
wider than type.
* NEWS: Document this.
Reported by Rainer Orth.

Signed-off-by: Eric Blake <ebb9@byu.net>
15 years agoFix a couple of index entries in the manual.
Ralf Wildenhues [Sat, 17 Oct 2009 05:12:54 +0000 (07:12 +0200)] 
Fix a couple of index entries in the manual.

* doc/autoconf.texi (Polymorphic Variables): Fix index entries
for AS_VAR_APPEND, AS_VAR_ARITH.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>