diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-03-11 13:26:08 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-14 15:27:47 -0700 |
| commit | a363f981ecf738979287882787b7323b9c7c6bfe (patch) | |
| tree | 1abd34ea6cd9a387fa6c962fc0fbb7a22bb459ea | |
| parent | configure: fix a regression in PCRE v1 detection (diff) | |
| download | tgif-a363f981ecf738979287882787b7323b9c7c6bfe.tar.xz | |
configure: detect redundant --with-libpcre & --with-libpcre1
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
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 |