From: Ævar Arnfjörð Bjarmason Date: Sun, 11 Mar 2018 13:26:08 +0000 (+0000) Subject: configure: detect redundant --with-libpcre & --with-libpcre1 X-Git-Tag: v2.18.0-rc0~167^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a363f981ecf738979287882787b7323b9c7c6bfe?hp=a91b113320cbf6abeeb3cc8f39467d00d5516af8 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 Signed-off-by: Junio C Hamano --- 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