VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

if mod_session_crypto prereq isn't available, don't bail if

Browse Source 
the module was enabled implicitly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198989 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2011-11-07 22:59:51 +00:00
parent 75c8dfdfdb
commit 3097e8585d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/session/config.m4
View File

@ -31,22 +31,32 @@ esac
APACHE_MODULE(session, session module, , , most) APACHE_MODULE(session, session module, , , most)
APACHE_MODULE(session_cookie, session cookie module, $session_cookie_objects, , $session_mods_enable) APACHE_MODULE(session_cookie, session cookie module, $session_cookie_objects, , $session_mods_enable)
APACHE_MODULE(session_crypto, session crypto module, $session_crypto_objects, , $session_mods_enable, [
if test "$enable_session_crypto" != ""; then
session_mods_enable_crypto=$enable_session_crypto
else
session_mods_enable_crypto=$session_mods_enable
fi
if test "$session_mods_enable_crypto" != "no"; then
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES" CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES"
AC_TRY_COMPILE([#include <apr_crypto.h>],[ AC_TRY_COMPILE([#include <apr_crypto.h>],[
#if APU_HAVE_CRYPTO == 0 #if APU_HAVE_CRYPTO == 0
#error no crypto support #error no crypto support
#endif #endif
], [ap_HAVE_APR_CRYPTO="yes"], [ap_HAVE_APR_CRYPTO="no"]) ], [ap_HAVE_APR_CRYPTO="yes"], [ap_HAVE_APR_CRYPTO="no"])
CPPFLAGS="$saved_CPPFLAGS" CPPFLAGS="$saved_CPPFLAGS"
if test $ap_HAVE_APR_CRYPTO = "no"; then if test $ap_HAVE_APR_CRYPTO = "no"; then
AC_MSG_WARN([Your APR does not include SSL/EVP support.]) AC_MSG_WARN([Your APR does not include SSL/EVP support.])
enable_session_crypto="no" if test "$enable_session_crypto" != "" -a "$enable_session_crypto" != "no"; then
AC_MSG_ERROR([mod_session_crypto cannot be enabled])
fi fi
]) session_mods_enable_crypto="no"
fi
fi
APACHE_MODULE(session_crypto, session crypto module, $session_crypto_objects, , $session_mods_enable_crypto)
APACHE_MODULE(session_dbd, session dbd module, $session_dbd_objects, , $session_mods_enable) APACHE_MODULE(session_dbd, session dbd module, $session_dbd_objects, , $session_mods_enable)
dnl APACHE_MODULE(session_ldap, session ldap module, , , $session_mods_enable)
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])