Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1781148 - /httpd/httpd/trunk/modules/filters/config.m4
Date: Tue, 31 Jan 2017 19:12:57 -0000
To: cvs@httpd.apache.org
From: jchampion@apache.org
Message-Id: <20170131191257.E2A573A090C@svn01-us-west.apache.org>
archived-at: Tue, 31 Jan 2017 19:12:59 -0000

Author: jchampion
Date: Tue Jan 31 19:12:57 2017
New Revision: 1781148

URL: http://svn.apache.org/viewvc?rev=1781148&view=rev
Log:
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).

Modified:
    httpd/httpd/trunk/modules/filters/config.m4

Modified: httpd/httpd/trunk/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/config.m4?rev=1781148&r1=1781147&r2=1781148&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/config.m4 (original)
+++ httpd/httpd/trunk/modules/filters/config.m4 Tue Jan 31 19:12:57 2017
@@ -5,7 +5,6 @@ dnl APACHE_MODULE(name, helptext[, objec
 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