svn commit: r1368448 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/session/config.m4

[ji...@apache.org]

Author: jim
Date: Thu Aug  2 13:05:28 2012
New Revision: 1368448

URL: http://svn.apache.org/viewvc?rev=1368448&view=rev
Log:
Merge r1324760 from trunk:

Your APR does not include SSL/EVP support. Yes, but how do I enable it? --with-crypto
Submitted by: igalic
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/session/config.m4

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1324760

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1368448&r1=1368447&r2=1368448&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Aug  2 13:05:28 2012
@@ -88,12 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * configure: Add message about how to enable crypto support in APR.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1324760
-     2.4.x patch: Trunk patch applies.
-     +1: rjung, sf, jim
-     rjung: igalic: you applied it to trunk, care to vote?
-
    * authz: pass the provider name to parse_require_line as pool userdata
      This allows a single C function to implement several authz providers.
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1351016

Modified: httpd/httpd/branches/2.4.x/modules/session/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/session/config.m4?rev=1368448&r1=1368447&r2=1368448&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/session/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/session/config.m4 Thu Aug  2 13:05:28 2012
@@ -47,7 +47,7 @@ if test "$session_mods_enable_crypto" !=
   ], [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.])
+    AC_MSG_WARN([Your APR does not include SSL/EVP support. To enable it: configure --with-crypto])
     if test "$enable_session_crypto" != "" -a "$enable_session_crypto" != "no"; then
         AC_MSG_ERROR([mod_session_crypto cannot be enabled])
     fi