From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 28 Jan 2018 14:29:10 +0000 (+0100)
Subject: Merge pull request #7881 from keszybz/pcre
X-Git-Tag: v237~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7755083256a89dfd8858cd62f1ee85c4b1327092;p=platform%2Fupstream%2Fsystemd.git

Merge pull request #7881 from keszybz/pcre

Add new --grep option to journalctl
---

7755083256a89dfd8858cd62f1ee85c4b1327092
diff --cc meson.build
index 4805ac4,1ecc6b0..36a62d2
--- a/meson.build
+++ b/meson.build
@@@ -1104,8 -1064,19 +1104,19 @@@ els
  endif
  conf.set10('HAVE_XKBCOMMON', have)
  
+ want_pcre2 = get_option('pcre2')
+ if want_pcre2 != 'false'
+         libpcre2 = dependency('libpcre2-8',
+                               required : want_pcre2 == 'true')
+         have = libpcre2.found()
+ else
+         have = false
+         libpcre2 = []
+ endif
+ conf.set10('HAVE_PCRE2', have)
+ 
  want_glib = get_option('glib')
 -if want_glib != 'false'
 +if want_glib != 'false' and not fuzzer_build
          libglib =    dependency('glib-2.0',
                                  version : '>= 2.22.0',
                                  required : want_glib == 'true')