httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1814940 - in /httpd/httpd/trunk: CHANGES acinclude.m4
Date Sat, 11 Nov 2017 10:36:17 GMT
Author: rjung
Date: Sat Nov 11 10:36:17 2017
New Revision: 1814940

URL: http://svn.apache.org/viewvc?rev=1814940&view=rev
Log:
Look for serf-1 instead of serf-0 during configure.
Using a fixed major version might not be the best
choice but using a fixed outdated one is even worse.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1814940&r1=1814939&r2=1814940&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Nov 11 10:36:17 2017
@@ -1,6 +1,9 @@
                                                          -*- 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]

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1814940&r1=1814939&r2=1814940&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Sat Nov 11 10:36:17 2017
@@ -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-0"
+      CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-1"
       AC_CHECK_HEADERS(serf.h,[
         save_ldflags="$LDFLAGS"
         LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
-        AC_CHECK_LIB(serf-0, serf_context_create,[ac_cv_serf="yes"])
+        AC_CHECK_LIB(serf-1, 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-0])
-    APR_ADDTO(MOD_INCLUDES, [-I$serf_prefix/include/serf-0])
+    APR_SETVAR(SERF_LIBS, [-L$serf_prefix/lib -lserf-1])
+    APR_ADDTO(MOD_INCLUDES, [-I$serf_prefix/include/serf-1])
   fi
 ])
 



Mime
View raw message