[patch] php5_2-sapi.eclass.diff

php5_2-sapi.eclass.diff (text/plain), 1.42 KB, created by Jakub Moc (RETIRED) on 2007-08-17 02:09:49 UTC

Index: php5_2-sapi.eclass
===================================================================
--- php5_2-sapi.eclass	(revision 1416)
+++ php5_2-sapi.eclass	(working copy)
@@ -58,8 +58,8 @@
 		imap? ( virtual/imap-c-client )
 		iodbc? ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 )
 		kerberos? ( virtual/krb5 )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+		ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
+		ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
 		libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
 		mcve? ( >=dev-libs/openssl-0.9.7 )
 		mhash? ( app-crypt/mhash )
@@ -190,6 +190,7 @@
 	# Direct USE conflicts
 	phpconfutils_use_conflict "gd" "gd-external"
 	phpconfutils_use_conflict "oci8" "oci8-instant-client"
+	phpconfutils_use_conflict "oci8" "ldap-sasl"
 	phpconfutils_use_conflict "pdo" "pdo-external"
 	phpconfutils_use_conflict "zip" "zip-external"
 	phpconfutils_use_conflict "qdbm" "gdbm"
@@ -500,8 +501,12 @@
 
 	# LDAP support
 	if use ldap || phpconfutils_usecheck ldap ; then
-		phpconfutils_extension_with		"ldap"			"ldap"			1
-		phpconfutils_extension_with		"ldap-sasl"		"ldap-sasl"		0
+		if use oci8 ; then
+			phpconfutils_extension_with	"ldap"			"ldap"			1 "${ORACLE_HOME}"
+		else
+			phpconfutils_extension_with	"ldap"			"ldap"			1
+			phpconfutils_extension_with	"ldap-sasl"		"ldap-sasl"		0
+		fi
 	fi
 
 	# MySQL support