summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2011-08-11 03:41:53 +0400
committerVlad Glagolev2011-08-31 09:46:13 +0400
commitc58be610574b73e2a5a8a490e890e68a9f4d7774 (patch)
tree383ab58f7222801248607814d5f184d198be4924
parent739e46fb7e3c2330f04e9cece2e9272586b8c3ad (diff)
apache22: improved dependency check
-rwxr-xr-xhttp/apache22/DEPENDS6
-rw-r--r--http/apache22/HISTORY3
2 files changed, 7 insertions, 2 deletions
diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index af158fc395..46d5d8284e 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,8 +1,10 @@
-#depends apr "--with-apr=${INSTALL_ROOT}/usr" &&
-#depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
depends apr &&
depends apr-util &&
+if list_find "$OPTS" "ldap"; then
+ depends -sub LDAP apr-util
+fi &&
+
optional_depends openssl \
'--enable-ssl' \
'--disable-ssl' \
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 22a31160c9..09d50bb663 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: force LDAP version of apr-util if any ldap module is selected
+
2011-05-22 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.2.19; SECURITY_PATCH++ (CVE-2011-1928)
swapped source urls; modified short desc