Commit 1f179f81 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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

the module was enabled implicitly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198989 13f79535-47bb-0310-9956-ffa450edef68
parent 24601f82

modules/session/config.m4

+14 −4
Changes for modules/session/config.m4: 14 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -31,7 +31,13 @@ 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>],[
@@ -42,11 +48,15 @@ APACHE_MODULE(session_crypto, session crypto module, $session_crypto_objects, , 
  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])