зеркало из https://github.com/microsoft/git.git
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 my94da9193a6
("grep: add support for PCRE v2", 2017-06-01) while renaming moving some variables. The intent of this check ever since it was added ina119f91e57
("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>
This commit is contained in:
Родитель
7fb6aefd2a
Коммит
a91b113320
|
@ -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)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче