Use system PCRE unless --with-pcre=internal is given

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=740573
Reviewed-by: Emmanuele Bassi <ebassi@gnome.org>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Simon McVittie 2016-01-05 12:20:20 +00:00
parent 855594c4de
commit 82c2461e3d
3 changed files with 17 additions and 1 deletions

7
NEWS
View File

@ -1,3 +1,10 @@
Overview of changes in GLib 2.47.5
==================================
* The system copy of PCRE is now used by default to implement GRegex.
Configure with --with-pcre=internal if a system PCRE version
is unavailable or undesired.
Overview of changes in GLib 2.47.4 Overview of changes in GLib 2.47.4
================================== ==================================

View File

@ -67,6 +67,13 @@ and attach the patch to that bug report.
Patches should be in unified diff form. (The -up option to GNU diff.) Patches should be in unified diff form. (The -up option to GNU diff.)
Notes about GLib 2.48
=====================
* The system copy of PCRE is now used by default to implement GRegex.
Configure with --with-pcre=internal if a system PCRE version
is unavailable or undesired.
Notes about GLib 2.46 Notes about GLib 2.46
===================== =====================

View File

@ -2312,7 +2312,9 @@ PCRE_REQUIRED_VERSION=8.13
# Check if we should use the internal or the system-supplied pcre # Check if we should use the internal or the system-supplied pcre
AC_ARG_WITH(pcre, AC_ARG_WITH(pcre,
[AS_HELP_STRING([--with-pcre=@<:@internal/system@:>@], [AS_HELP_STRING([--with-pcre=@<:@internal/system@:>@],
[whether to use system PCRE [default=internal]])]) [whether to use system PCRE [default=system]])],
[],
[with_pcre=system])
AM_CONDITIONAL(USE_SYSTEM_PCRE, [test "x$with_pcre" = xsystem]) AM_CONDITIONAL(USE_SYSTEM_PCRE, [test "x$with_pcre" = xsystem])