diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-03-11 14:26:07 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 23:27:36 +0100 |
| commit | a91b113320cbf6abeeb3cc8f39467d00d5516af8 (patch) | |
| tree | e634f9555663536bce3e52552ffbd5e788f61673 /configure.ac | |
| parent | Merge branch 'nd/parseopt-completion' (diff) | |
| download | git-a91b113320cbf6abeeb3cc8f39467d00d5516af8.tar.xz git-a91b113320cbf6abeeb3cc8f39467d00d5516af8.zip | |
configure: fix a regression in PCRE v1 detection
Change the check for PCRE v1 to disable the --with-libpcre1 option if
the pcre_version() function can't be found in the pcre library. I
unintentionally changed this in my 94da9193a6 ("grep: add support for
PCRE v2", 2017-06-01) while renaming moving some variables.
The intent of this check ever since it was added in
a119f91e57 ("configure: Check for libpcre", 2011-05-09) is to
second-guess the user and turn off an explicitly provided
--with-libpcre if the library can't be found.
I don't think that behavior makes any sense, we shouldn't be
second-guessing the user with an auto-detection, but changing that
needs a bigger refactoring of this script, and only has marginal
benefits. So let's fix it to work as it was intended to work again.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7f8415140f..41ceb2ac81 100644 --- a/configure.ac +++ b/configure.ac @@ -549,8 +549,8 @@ if test -n "$USE_LIBPCRE1"; then GIT_STASH_FLAGS($LIBPCREDIR) AC_CHECK_LIB([pcre], [pcre_version], -[USE_LIBPCRE=YesPlease], -[USE_LIBPCRE=]) +[USE_LIBPCRE1=YesPlease], +[USE_LIBPCRE1=]) GIT_UNSTASH_FLAGS($LIBPCREDIR) |