From 681948ae61d16256c7da12c16915a46c735f1e2b Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sat, 11 Nov 2017 14:45:26 +0000 Subject: [PATCH] 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 --- CHANGES | 3 --- acinclude.m4 | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 2a7d0781b5..04b22ba73b 100644 --- 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 c3b1c1c854..336f5ab697 100644 --- 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 ]) -- 2.40.0