From: Jacob Champion <jchampion@apache.org>
Date: Tue, 31 Jan 2017 19:12:57 +0000 (+0000)
Subject: configure: add dependency checks for mod_crypto
X-Git-Tag: 2.5.0-alpha~719
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1297975f0f74c1df3b51ee58db49897c572da54b;p=thirdparty%2Fapache%2Fhttpd.git

configure: add dependency checks for mod_crypto

Don't enable mod_crypto in reallyall builds if we don't have a dev
version of APR-util (or APR 2).

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

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 17af1e6efcf..5f41771555c 100644
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -5,7 +5,6 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 APACHE_MODPATH_INIT(filters)
 
 APACHE_MODULE(buffer, Filter Buffering, , , most)
-APACHE_MODULE(crypto, Symmetrical encryption / decryption, , , no)
 APACHE_MODULE(data, RFC2397 data encoder, , , )
 APACHE_MODULE(ratelimit, Output Bandwidth Limiting, , , most)
 APACHE_MODULE(reqtimeout, Limit time waiting for request from client, , , yes)
@@ -193,6 +192,25 @@ if (o) return *o;],
   fi
 ])
 
+APACHE_MODULE(crypto, Symmetrical encryption / decryption, , , no, [
+  dnl Check for the required APR-util version.
+  AC_MSG_CHECKING([for APR-util >= 1.6])
+  if test "$apr_major_version" -lt 2; then
+    case "$APU_VERSION" in
+    dnl Sorry for the quadrigraphs; this expands to "1.[0-5].*)"
+    1.@<:@0-5@:>@.*)
+      AC_MSG_RESULT(no)
+      enable_crypto=no
+      ;;
+    *)
+      AC_MSG_RESULT(yes)
+      ;;
+    esac
+  else
+    AC_MSG_RESULT([yes (APR 2)])
+  fi
+])
+
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 
 APACHE_MODPATH_FINISH