From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Mar 2018 22:10:58 +0000 (-0700)
Subject: Merge branch 'ab/pcre-v2' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e77b1169036182c32a7606d5d521c4e63c671749?hp=--cc

Merge branch 'ab/pcre-v2' into next

Git can be built to use either v1 or v2 of the PCRE library, and so
far, the build-time configuration USE_LIBPCRE=YesPlease instructed
the build procedure to use v1, but now it means v2.  USE_LIBPCRE1
and USE_LIBPCRE2 can be used to explicitly choose which version to
use, as before.

* ab/pcre-v2:
Makefile: make USE_LIBPCRE=YesPlease mean v2, not v1
configure: detect redundant --with-libpcre & --with-libpcre1
configure: fix a regression in PCRE v1 detection
---

e77b1169036182c32a7606d5d521c4e63c671749