diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06bbe07f..65984320 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,6 @@ jobs: geoip \ ssdeep \ pcre \ - pcre2 \ bison \ flex - uses: actions/checkout@v4 diff --git a/build/pcre2.m4 b/build/pcre2.m4 index dde0bca9..aaa4f8a1 100644 --- a/build/pcre2.m4 +++ b/build/pcre2.m4 @@ -29,8 +29,8 @@ if test "x${with_pcre2}" == "xno"; then AC_MSG_NOTICE([Support for PCRE2 was disabled by the utilization of --without-pcre2 or --with-pcre2=no]) PCRE2_DISABLED=yes else - # pcre2 is the default PCRE2_MANDATORY=yes + AC_MSG_NOTICE([PCRE2 is enabled by default.]) # if test "x${with_pcre2}" == "xyes"; then # PCRE2_MANDATORY=yes # AC_MSG_NOTICE([PCRE2 support was marked as mandatory by the utilization of --with-pcre2=yes]) @@ -98,9 +98,14 @@ else AC_MSG_NOTICE([PCRE2 is disabled by default.]) else PCRE2_FOUND=1 - AC_MSG_NOTICE([using PCRE2 v${PCRE2_VERSION}]) PCRE2_CFLAGS="${PCRE2_CFLAGS}" PCRE2_DISPLAY="${PCRE2_LDADD}, ${PCRE2_CFLAGS}" + AC_MSG_NOTICE([using PCRE2_VERSION ${PCRE2_VERSION}]) + AC_MSG_NOTICE([using PCRE2_LDADD ${PCRE2_LDADD}]) + AC_MSG_NOTICE([using PCRE2_LIBS ${PCRE2_LIBS}]) + AC_MSG_NOTICE([using PCRE2_LDFLAGS ${PCRE2_LDFLAGS}]) + AC_MSG_NOTICE([using PCRE2_CFLAGS ${PCRE2_CFLAGS}]) + AC_MSG_NOTICE([using PCRE2_DISPLAY ${PCRE2_DISPLAY}]) AC_SUBST(PCRE2_VERSION) AC_SUBST(PCRE2_LDADD) AC_SUBST(PCRE2_LIBS)