You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2009/01/03 17:12:55 UTC
svn commit: r731009 - /httpd/httpd/trunk/modules/session/config.m4
Author: rjung
Date: Sat Jan 3 08:12:55 2009
New Revision: 731009
URL: http://svn.apache.org/viewvc?rev=731009&view=rev
Log:
Allow feature test for apr_ssl.h to succeed:
Add necessary search paths temporarily to CPPFLAGS.
Addition to r730717.
When switching to another header, no need to again
rename the ap_HAVE_APR_CRYPTO variable.
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=731009&r1=731008&r2=731009&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/config.m4 (original)
+++ httpd/httpd/trunk/modules/session/config.m4 Sat Jan 3 08:12:55 2009
@@ -18,8 +18,11 @@
APACHE_MODULE(session, session module, , , most)
APACHE_MODULE(session_cookie, session cookie module, , , $session_mods_enable)
APACHE_MODULE(session_crypto, session crypto module, , , no, [
- AC_CHECK_HEADERS(apr_ssl.h, [ap_HAVE_APR_SSL_H="yes"], [ap_HAVE_APR_SSL_H="no"])
- if test $ap_HAVE_APR_SSL_H = "no"; then
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$APR_INCLUDEDIR -I$APU_INCLUDEDIR"
+ 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
AC_MSG_WARN([Your APR does not include SSL/EVP support.])
enable_session_crypto="no"
fi
Re: svn commit: r731009 - /httpd/httpd/trunk/modules/session/config.m4
Posted by Ruediger Pluem <rp...@apache.org>.
On 01/04/2009 12:01 AM, Ruediger Pluem wrote:
>
> On 01/03/2009 05:12 PM, rjung@apache.org wrote:
>> Author: rjung
>> Date: Sat Jan 3 08:12:55 2009
>> New Revision: 731009
>>
>> URL: http://svn.apache.org/viewvc?rev=731009&view=rev
>> Log:
>> Allow feature test for apr_ssl.h to succeed:
>> Add necessary search paths temporarily to CPPFLAGS.
>>
>> Addition to r730717.
>>
>> When switching to another header, no need to again
>> rename the ap_HAVE_APR_CRYPTO variable.
>>
>> 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=731009&r1=731008&r2=731009&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/session/config.m4 (original)
>> +++ httpd/httpd/trunk/modules/session/config.m4 Sat Jan 3 08:12:55 2009
>> @@ -18,8 +18,11 @@
>> APACHE_MODULE(session, session module, , , most)
>> APACHE_MODULE(session_cookie, session cookie module, , , $session_mods_enable)
>> APACHE_MODULE(session_crypto, session crypto module, , , no, [
>> - AC_CHECK_HEADERS(apr_ssl.h, [ap_HAVE_APR_SSL_H="yes"], [ap_HAVE_APR_SSL_H="no"])
>> - if test $ap_HAVE_APR_SSL_H = "no"; then
>> + saved_CPPFLAGS="$CPPFLAGS"
>
> Does it make sense to save these flags if you do not restore them later on?
>
>> + CPPFLAGS="$CPPFLAGS -I$APR_INCLUDEDIR -I$APU_INCLUDEDIR"
>> + AC_CHECK_HEADERS(apr_crypto.h, [ap_HAVE_APR_CRYPTO="yes"], [ap_HAVE_APR_CRYPTO="no"])
>> + CPPFLAGS="$saved_CPPFLAGS"
Ahh, sorry. Out of coffee error.
Regards
Rüdiger
Re: svn commit: r731009 - /httpd/httpd/trunk/modules/session/config.m4
Posted by Ruediger Pluem <rp...@apache.org>.
On 01/03/2009 05:12 PM, rjung@apache.org wrote:
> Author: rjung
> Date: Sat Jan 3 08:12:55 2009
> New Revision: 731009
>
> URL: http://svn.apache.org/viewvc?rev=731009&view=rev
> Log:
> Allow feature test for apr_ssl.h to succeed:
> Add necessary search paths temporarily to CPPFLAGS.
>
> Addition to r730717.
>
> When switching to another header, no need to again
> rename the ap_HAVE_APR_CRYPTO variable.
>
> 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=731009&r1=731008&r2=731009&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/session/config.m4 (original)
> +++ httpd/httpd/trunk/modules/session/config.m4 Sat Jan 3 08:12:55 2009
> @@ -18,8 +18,11 @@
> APACHE_MODULE(session, session module, , , most)
> APACHE_MODULE(session_cookie, session cookie module, , , $session_mods_enable)
> APACHE_MODULE(session_crypto, session crypto module, , , no, [
> - AC_CHECK_HEADERS(apr_ssl.h, [ap_HAVE_APR_SSL_H="yes"], [ap_HAVE_APR_SSL_H="no"])
> - if test $ap_HAVE_APR_SSL_H = "no"; then
> + saved_CPPFLAGS="$CPPFLAGS"
Does it make sense to save these flags if you do not restore them later on?
> + CPPFLAGS="$CPPFLAGS -I$APR_INCLUDEDIR -I$APU_INCLUDEDIR"
> + 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
> AC_MSG_WARN([Your APR does not include SSL/EVP support.])
> enable_session_crypto="no"
> fi
Regards
Rüdiger