[62922] trunk/dports/www

[ryandesign at macports.org]

Revision: 62922
          http://trac.macports.org/changeset/62922
Author:   ryandesign at macports.org
Date:     2010-01-21 16:28:45 -0800 (Thu, 21 Jan 2010)
Log Message:
-----------
apache2/apache20: when using +openldap variant, ensure apr-util/apr-util0 is installed with +openldap variant; see #19595

Modified Paths:
--------------
    trunk/dports/www/apache2/Portfile
    trunk/dports/www/apache20/Portfile

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile	2010-01-21 23:54:38 UTC (rev 62921)
+++ trunk/dports/www/apache2/Portfile	2010-01-22 00:28:45 UTC (rev 62922)
@@ -131,6 +131,16 @@
 variant openldap description {Enable LDAP support through OpenLDAP} {
 	configure.args-append --enable-ldap --enable-authnz-ldap
 	depends_lib-append port:openldap
+	pre-configure {
+		if {-1 == [string first -lldap [exec ${prefix}/bin/apu-1-config --libs]]} {
+			ui_error "To install ${name} with the +openldap variant, apr-util must be installed"
+			ui_error "with the +openldap variant. Rebuild apr-util using:"
+			ui_error
+			ui_error "    sudo port upgrade --enforce-variants apr-util +openldap"
+			ui_error
+			return -code error "incompatible apr-util installation"
+		}
+	}
 }
 
 variant preforkmpm conflicts workermpm eventmpm description {Use prefork MPM} {

Modified: trunk/dports/www/apache20/Portfile
===================================================================
--- trunk/dports/www/apache20/Portfile	2010-01-21 23:54:38 UTC (rev 62921)
+++ trunk/dports/www/apache20/Portfile	2010-01-22 00:28:45 UTC (rev 62922)
@@ -144,6 +144,16 @@
 variant openldap description {Enable LDAP support through OpenLDAP} {
 	configure.args-append --enable-ldap --enable-authnz-ldap
 	depends_lib-append port:openldap
+	pre-configure {
+		if {-1 == [string first -lldap [exec ${prefix}/bin/apu-config --libs]]} {
+			ui_error "To install ${name} with the +openldap variant, apr-util0 must be installed"
+			ui_error "with the +openldap variant. Rebuild apr-util0 using:"
+			ui_error
+			ui_error "    sudo port upgrade --enforce-variants apr-util0 +openldap"
+			ui_error
+			return -code error "incompatible apr-util0 installation"
+		}
+	}
 }
 
 variant preforkmpm conflicts workermpm description {Use prefork MPM} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100121/d48c3f5d/attachment.html>