Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/autotools-wrappers:main commit in: /
Date: Sun, 30 Jan 2022 09:24:25
Message-Id: 1643528509.733d554fe2d1774f56dcf16f0b90e7f985e3abc2.vapier@gentoo
1 commit: 733d554fe2d1774f56dcf16f0b90e7f985e3abc2
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 30 07:41:49 2022 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 30 07:41:49 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/autotools-wrappers.git/commit/?id=733d554f
7
8 autoconf-wrapper: clean up old error message
9
10 Unwrap it a bit to take up fewer lines while still fitting within a
11 reasonable line length, and fix the grammar in a number of places.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 ac-wrapper.sh | 10 +++++-----
16 1 file changed, 5 insertions(+), 5 deletions(-)
17
18 diff --git a/ac-wrapper.sh b/ac-wrapper.sh
19 index acc6fe9..ca23928 100755
20 --- a/ac-wrapper.sh
21 +++ b/ac-wrapper.sh
22 @@ -146,11 +146,11 @@ generated_version() {
23 # autodetect routine
24 #
25 if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
26 - err "Since configure.ac is present, aclocal always use\n" \
27 - "\tautoconf 2.59+, which conflicts with your choice and\n" \
28 - "\tcauses error. You have two options:\n" \
29 - "\t1. Try execute command again after removing configure.ac\n" \
30 - "\t2. Don't set WANT_AUTOCONF"
31 + err \
32 + "Since configure.ac is present, aclocal will always use autoconf 2.59+\n" \
33 + "\twhich conflicts with your choice and causes errors. You have two options:\n" \
34 + "\t1. Try executing the command again after removing configure.ac\n" \
35 + "\t2. Don't set WANT_AUTOCONF (currently set to '${WANT_AUTOCONF}')"
36 fi
37
38 if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then