Changeset 588 for trunk/configure.ac

Timestamp:

Oct 26, 2025, 12:17:47 PM (16 hours ago)

Author:

katerina

Message:

Fix for ticket #476 (move logfile monitoring module from PCRE to PCRE2).

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -1679 +1679 @@
         [
         if test "x${enable_logfile_monitor}" = xyes; then
-           AC_CHECK_HEADER(pcre.h,
+           cflags_store="$CFLAGS"
+           CFLAGS="$CFLAGS -DPCRE2_CODE_UNIT_WIDTH=8"
+           AC_CHECK_HEADER(pcre2.h,
                            [ 
                            AC_DEFINE([USE_LOGFILE_MONITOR], [1], [Define if you want the logfile monitor module.])
-                           LIBS="-lpcre $LIBS"
+                           LIBS="-lpcre2-8 $LIBS"
                            ],
                            [
-                                AC_CHECK_HEADER(pcre/pcre.h,
+                                AC_CHECK_HEADER(pcre2/pcre2.h,
                                 [
                                 AC_DEFINE([USE_LOGFILE_MONITOR], [1], [Define if you want the logfile monitor module.])
-                                AC_DEFINE([HAVE_PCRE_PCRE_H], [1], [Define if you have pcre/pcre.h.])
-                                LIBS="-lpcre $LIBS"
+                                AC_DEFINE([HAVE_PCRE2_PCRE2_H], [1], [Define if you have pcre2/pcre2.h.])
+                                LIBS="-lpcre2-8 $LIBS"
                                 ],
                                 [AC_MSG_ERROR([The --enable-logfile-monitor option requires libpcre. For compiling the pcre development package is needed.])]
@@ -1695 +1697 @@
                           ]
            )
-           AC_CHECK_LIB(pcre, pcre_dfa_exec, [
-                              AC_DEFINE([HAVE_PCRE_DFA_EXEC], [1], [Define if you have pcre_dfa_exec])
-                              ], [
-                              AC_MSG_WARN([pcre_dfa_exec not available])
-                              ])
+          CFLAGS="$cflags_store"
         fi
         ]