From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15F01158087 for ; Sun, 30 Jan 2022 09:24:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9B212BC046; Sun, 30 Jan 2022 09:24:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C52582BC046 for ; Sun, 30 Jan 2022 09:24:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DECDB34314E for ; Sun, 30 Jan 2022 09:24:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BAEF2AE for ; Sun, 30 Jan 2022 09:24:21 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1643528509.733d554fe2d1774f56dcf16f0b90e7f985e3abc2.vapier@gentoo> Subject: [gentoo-commits] proj/autotools-wrappers:main commit in: / X-VCS-Repository: proj/autotools-wrappers X-VCS-Files: ac-wrapper.sh X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 733d554fe2d1774f56dcf16f0b90e7f985e3abc2 X-VCS-Branch: main Date: Sun, 30 Jan 2022 09:24:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31cb59c5-ab70-46c1-9bf5-c50cf65cba7b X-Archives-Hash: 4683177edd31f8e09ddc0442eda9df83 commit: 733d554fe2d1774f56dcf16f0b90e7f985e3abc2 Author: Mike Frysinger gentoo org> AuthorDate: Sun Jan 30 07:41:49 2022 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Jan 30 07:41:49 2022 +0000 URL: https://gitweb.gentoo.org/proj/autotools-wrappers.git/commit/?id=733d554f autoconf-wrapper: clean up old error message Unwrap it a bit to take up fewer lines while still fitting within a reasonable line length, and fix the grammar in a number of places. Signed-off-by: Mike Frysinger gentoo.org> ac-wrapper.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ac-wrapper.sh b/ac-wrapper.sh index acc6fe9..ca23928 100755 --- a/ac-wrapper.sh +++ b/ac-wrapper.sh @@ -146,11 +146,11 @@ generated_version() { # autodetect routine # if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then - err "Since configure.ac is present, aclocal always use\n" \ - "\tautoconf 2.59+, which conflicts with your choice and\n" \ - "\tcauses error. You have two options:\n" \ - "\t1. Try execute command again after removing configure.ac\n" \ - "\t2. Don't set WANT_AUTOCONF" + err \ + "Since configure.ac is present, aclocal will always use autoconf 2.59+\n" \ + "\twhich conflicts with your choice and causes errors. You have two options:\n" \ + "\t1. Try executing the command again after removing configure.ac\n" \ + "\t2. Don't set WANT_AUTOCONF (currently set to '${WANT_AUTOCONF}')" fi if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then