From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/3] configure: detect redundant --with-libpcre & --with-libpcre1
Date: Sun, 11 Mar 2018 13:26:08 +0000 [thread overview]
Message-ID: <20180311132609.32154-3-avarab@gmail.com> (raw)
In-Reply-To: <20180311132609.32154-1-avarab@gmail.com>
The --with-libpcre option is a synonym for the --with-libpcre1 flag,
but the configure script allowed for redundantly specifying both.
Nothing broke as a result of this, but it's confusing, so let's
disallow it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
index 41ceb2ac81..d1b3b143c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,10 @@ AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre1]),
AC_ARG_WITH(libpcre1,
AS_HELP_STRING([--with-libpcre1],[support Perl-compatible regexes via libpcre1 (default is NO)])
AS_HELP_STRING([], [ARG can be also prefix for libpcre library and headers]),
+ if test -n "$USE_LIBPCRE1"; then
+ AC_MSG_ERROR([Only supply one of --with-libpcre or its synonym --with-libpcre1!])
+ fi
+
if test "$withval" = "no"; then
USE_LIBPCRE1=
elif test "$withval" = "yes"; then
--
2.15.1.424.g9478a66081
next prev parent reply other threads:[~2018-03-11 13:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-11 13:26 [PATCH 0/3] Switch the default PCRE from v1 to v2 + configure fixes Ævar Arnfjörð Bjarmason
2018-03-11 13:26 ` [PATCH 1/3] configure: fix a regression in PCRE v1 detection Ævar Arnfjörð Bjarmason
2018-03-11 13:26 ` Ævar Arnfjörð Bjarmason [this message]
2018-03-11 13:26 ` [PATCH 3/3] Makefile: make USE_LIBPCRE=YesPlease mean v2, not v1 Ævar Arnfjörð Bjarmason
2018-03-14 22:41 ` [PATCH 0/3] Switch the default PCRE from v1 to v2 + configure fixes Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180311132609.32154-3-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michal.kiedrowicz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).