diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2021-12-15 17:12:31 -0500 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2021-12-15 17:12:31 -0500 |
| commit | fa82e037491a8c7dbc945807ad5cdae9a9735ad1 (patch) | |
| tree | b2b62cb1346960ec6fe36cd614978b7e7f486a8c /configure.ac | |
| parent | f58e8dda1be825d364ac4634c5f231b755210a1f (diff) | |
| download | lighttpd-git-fa82e037491a8c7dbc945807ad5cdae9a9735ad1.tar.gz | |
[build] pcre2: use pkg-config before pcre2-config
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2a6d5de1..d458e159 100644 --- a/configure.ac +++ b/configure.ac @@ -921,11 +921,16 @@ if test "$WITH_PCRE2" != no; then PCRE_LIB="-L$WITH_PCRE2/lib -lpcre2-8" CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include" else - AC_PATH_PROG([PCRE2CONFIG], [pcre2-config]) - if test -n "$PCRE2CONFIG"; then - PCRE_LIB=`"$PCRE2CONFIG" --libs8` - CPPFLAGS="$CPPFLAGS `"$PCRE2CONFIG" --cflags`" - fi + PKG_CHECK_MODULES([PCRE2],[libpcre2-8],[ + PCRE_LIB="$PCRE2_LIBS" + CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS" + ],[ + AC_PATH_PROG([PCRE2CONFIG], [pcre2-config]) + if test -n "$PCRE2CONFIG"; then + PCRE_LIB=`"$PCRE2CONFIG" --libs8` + CPPFLAGS="$CPPFLAGS `"$PCRE2CONFIG" --cflags`" + fi + ]) fi if test -z "$PCRE_LIB"; then |