Merge pull request #7881 from keszybz/pcre

Add new --grep option to journalctl

diff --cc meson.build
index 4805ac494939644874c244964a6a05ed07316e0b,1ecc6b088ba193f069ba5ced212aacf69beba465..36a62d280df0d8b14780be326e7d7999883d4d04
--- 1/meson.build
--- 2/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')

diff --cc meson_options.txt
Simple merge

diff --cc src/shared/logs-show.c
Simple merge

diff --cc src/test/meson.build
Simple merge