From: Jeff Trawick <trawick@apache.org>
Date: Wed, 3 Mar 2010 16:44:57 +0000 (+0000)
Subject: use separate #error message when APR[-Util] is of a valid
X-Git-Tag: 2.3.6~405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6fc6d32b677c7a66b7357582fbb7fd5c6670fd8;p=apache

use separate #error message when APR[-Util] is of a valid
version but wasn't built with crypto support


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

diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c
index f31c778695..5cbf5a4636 100644
--- a/modules/session/mod_session_crypto.c
+++ b/modules/session/mod_session_crypto.c
@@ -21,7 +21,15 @@
 #include "apr_strings.h"
 #include "http_log.h"
 
-#if (APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 4)) && APU_HAVE_CRYPTO > 0
+#if APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION < 4
+
+#error session_crypto_module requires APR v1.4.0 or later
+
+#elif APU_HAVE_CRYPTO == 0
+
+#error Crypto support must be enabled in APR
+
+#else
 
 #include "apr_crypto.h"                /* for apr_*_crypt et al */
 
@@ -598,6 +606,4 @@ module AP_MODULE_DECLARE_DATA session_crypto_module =
     register_hooks                    /* register hooks */
 };
 
-#else
-#error session_crypto_module requires APR v1.4.0 or later
 #endif