From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Apr 2018 23:25:43 +0000 (+0900)
Subject: Merge branch 'ab/pcre-v2'
X-Git-Tag: v2.18.0-rc0~167
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cac5351363c5713248b8494e1e58e282c0a5bde7?ds=inline;hp=--cc

Merge branch 'ab/pcre-v2'

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
---

cac5351363c5713248b8494e1e58e282c0a5bde7