httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1198989 - /httpd/httpd/trunk/modules/session/config.m4
Date Mon, 07 Nov 2011 22:59:52 GMT
Author: trawick
Date: Mon Nov  7 22:59:51 2011
New Revision: 1198989

URL: http://svn.apache.org/viewvc?rev=1198989&view=rev
Log:
if mod_session_crypto prereq isn't available, don't bail if
the module was enabled implicitly

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=1198989&r1=1198988&r2=1198989&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/config.m4 (original)
+++ httpd/httpd/trunk/modules/session/config.m4 Mon Nov  7 22:59:51 2011
@@ -31,22 +31,32 @@ esac
 
 APACHE_MODULE(session, session module, , , most)
 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"
   CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES"
   AC_TRY_COMPILE([#include <apr_crypto.h>],[
 #if APU_HAVE_CRYPTO == 0
 #error no crypto support
 #endif
-], [ap_HAVE_APR_CRYPTO="yes"], [ap_HAVE_APR_CRYPTO="no"])
+  ], [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"
+    if test "$enable_session_crypto" != "" -a "$enable_session_crypto" != "no"; then
+        AC_MSG_ERROR([mod_session_crypto cannot be enabled])
+    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)
-dnl APACHE_MODULE(session_ldap, session ldap module, , , $session_mods_enable)
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 



Mime
View raw message