mpm_prefork: follow up to r1635521.

[apache] / configure.in

diff --git a/configure.in b/configure.in
index 549416b72f2030db150fd0e778a223be8d20d366..55e5e32060693dfd1e8c92b0955012f69f90e595 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -236,7 +236,10 @@ if test "$PCRE_CONFIG" != "false"; then
   fi
   case `$PCRE_CONFIG --version` in
   [[1-5].*])
-    AC_MSG_ERROR([Need at least pcre version 6.0])
+    AC_MSG_ERROR([Need at least pcre version 6.7])
+    ;;
+  [6.[0-6]*])
+    AC_MSG_ERROR([Need at least pcre version 6.7])
     ;;
   esac
   AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
@@ -272,6 +275,8 @@ APR_ADDTO(INCLUDES, $APU_INCLUDES)
 dnl Add in path to PCRE includes
 APR_ADDTO(INCLUDES, $PCRE_INCLUDES)
 
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PCRE_INCLUDES"
 AC_EGREP_CPP(yes,
 [
 #include <pcre.h>
@@ -282,6 +287,7 @@ yes
 if test "$pcre_have_dupnames" != "yes"; then
     AC_MSG_ERROR([pcre version does not support PCRE_DUPNAMES])
 fi
+CPPFLAGS="$save_CPPFLAGS"
 
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Applying OS-specific hints for httpd...])
@@ -525,18 +531,7 @@ if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
     AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
 fi
 
-dnl Check for systemd support for listen.c's socket activation.
-case $host in
-*-linux-*)
-      AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
-      AC_CHECK_HEADERS(systemd/sd-daemon.h)
-      if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
-        AC_MSG_WARN([Your system does not support systemd.])
-      else
-        APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
-        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
-      fi
-esac
+APACHE_CHECK_SYSTEMD
 
 dnl ## Set up any appropriate OS-specific environment variables for apachectl