httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r951766 - /httpd/httpd/trunk/modules/session/config.m4
Date Sat, 05 Jun 2010 20:58:43 GMT
Author: rjung
Date: Sat Jun  5 20:58:43 2010
New Revision: 951766

URL: http://svn.apache.org/viewvc?rev=951766&view=rev
Log:
Fix broken mod_session_crypto build.

Using -I$APR_INCLUDEDIR and -I$APU_INCLUDEDIR breaks
for APR 2, because $APU_INCLUDEDIR is empty and a
lonely "-I" doesn't do good for the compiler.

It also breaks for VPATH builds, because then
$APR_INCLUDEDIR contains two paths.

Using $APR_INCLUDES $APU_INCLUDES fixes both problems
and seems to be the way it is done for other modules.

Modified:
    httpd/httpd/trunk/modules/session/config.m4

Modified: httpd/httpd/trunk/modules/session/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/config.m4?rev=951766&r1=951765&r2=951766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/config.m4 (original)
+++ httpd/httpd/trunk/modules/session/config.m4 Sat Jun  5 20:58:43 2010
@@ -19,7 +19,7 @@ APACHE_MODULE(session, session module, ,
 APACHE_MODULE(session_cookie, session cookie module, , , $session_mods_enable)
 APACHE_MODULE(session_crypto, session crypto module, , , no, [
   saved_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS -I$APR_INCLUDEDIR -I$APU_INCLUDEDIR"
+  CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES"
   AC_CHECK_HEADERS(apr_crypto.h, [ap_HAVE_APR_CRYPTO="yes"], [ap_HAVE_APR_CRYPTO="no"])
   CPPFLAGS="$saved_CPPFLAGS"
   if test $ap_HAVE_APR_CRYPTO = "no"; then



Mime
View raw message