Revert r1814940: serf-1 has a different API,

so in order to support it more changes are necessary.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814954 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2a7d0781b520b13371d38edb21f3852a0509926f..04b22ba73b6497f290031b5d80638a6f2154eed7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
-  *) mod_serf, event MPM: look for serf-1 instead of serf-0 during configure.
-     [Rainer Jung]
-
   *) mod_noloris: complete build setup.  [Rainer Jung]
 
   *) mod_md: fix static compilation.  [Rainer Jung]

diff --git a/acinclude.m4 b/acinclude.m4
index c3b1c1c8549be8bbc56d7ce1af5cd36ab0cd8efb..336f5ab69763789a413c260215fe4da299c531de 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -795,11 +795,11 @@ AC_DEFUN([APACHE_CHECK_SERF], [
 
     if test "$serf_prefix" != "no" ; then
       save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-1"
+      CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-0"
       AC_CHECK_HEADERS(serf.h,[
         save_ldflags="$LDFLAGS"
         LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
-        AC_CHECK_LIB(serf-1, serf_context_create,[ac_cv_serf="yes"])
+        AC_CHECK_LIB(serf-0, serf_context_create,[ac_cv_serf="yes"])
         LDFLAGS="$save_ldflags"])
       CPPFLAGS="$save_cppflags"
     fi
@@ -808,8 +808,8 @@ AC_DEFUN([APACHE_CHECK_SERF], [
   APACHE_SUBST(SERF_LIBS)
   if test "$ac_cv_serf" = "yes"; then
     AC_DEFINE(HAVE_SERF, 1, [Define if libserf is available])
-    APR_SETVAR(SERF_LIBS, [-L$serf_prefix/lib -lserf-1])
-    APR_ADDTO(MOD_INCLUDES, [-I$serf_prefix/include/serf-1])
+    APR_SETVAR(SERF_LIBS, [-L$serf_prefix/lib -lserf-0])
+    APR_ADDTO(MOD_INCLUDES, [-I$serf_prefix/include/serf-0])
   fi
 ])