httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r555458 - in /httpd/httpd/trunk: configure.in modules/ssl/config.m4
Date Thu, 12 Jul 2007 02:06:02 GMT
Author: pquerna
Date: Wed Jul 11 19:06:01 2007
New Revision: 555458

URL: http://svn.apache.org/viewvc?view=rev&rev=555458
Log:
Fix VPATH builds of httpd with the apr_memcache backend for ssl sessions, when APR and APR-Util
are also in a VPATH.  This is caused by APR_INCLUDEDIR actually having multiple paths in a
VPATH builds, so we need to use _INCLUDES instead.

Modified:
    httpd/httpd/trunk/configure.in
    httpd/httpd/trunk/modules/ssl/config.m4

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?view=diff&rev=555458&r1=555457&r2=555458
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Wed Jul 11 19:06:01 2007
@@ -95,6 +95,7 @@
 SHLIBPATH_VAR=`$apr_config --shlib-path-var`
 APR_BINDIR=`$apr_config --bindir`
 APR_INCLUDEDIR=`$apr_config --includedir`
+APR_INCLUDES=`$apr_config --includes`
 APR_VERSION=`$apr_config --version`
 APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
 
@@ -136,6 +137,7 @@
 APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
 APU_BINDIR=`$apu_config --bindir`
 APU_INCLUDEDIR=`$apu_config --includedir`
+APU_INCLUDES=`$apu_config --includes`
 APU_VERSION=`$apu_config --version`
 APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
 

Modified: httpd/httpd/trunk/modules/ssl/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/config.m4?view=diff&rev=555458&r1=555457&r2=555458
==============================================================================
--- httpd/httpd/trunk/modules/ssl/config.m4 (original)
+++ httpd/httpd/trunk/modules/ssl/config.m4 Wed Jul 11 19:06:01 2007
@@ -117,7 +117,7 @@
   fi
   if test "$ap_ssltk_mc" = "yes"; then
     save_cpp=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS -I$APR_INCLUDEDIR -I$APU_INCLUDEDIR"
+    CPPFLAGS="$CPPFLAGS -I$APR_INCLUDES -I$APU_INCLUDES"
     AC_CHECK_HEADER(
       [apr_memcache.h],
       [],



Mime
View raw message