summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-01-04 09:22:48 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-01-04 09:22:48 +0000
commit11b87d387d766fb4d09f9a332dc3894314e48416 (patch)
treea32b6da0e902669383df9ad5d9bb503f04fec3f6 /eclass/php-common-r1.eclass
parentfix dev-lang/php + arm + firebird (diff)
downloadgentoo-2-11b87d387d766fb4d09f9a332dc3894314e48416.tar.gz
gentoo-2-11b87d387d766fb4d09f9a332dc3894314e48416.tar.bz2
gentoo-2-11b87d387d766fb4d09f9a332dc3894314e48416.zip
Update the PHP packages, sync with overlay.
Diffstat (limited to 'eclass/php-common-r1.eclass')
-rw-r--r--eclass/php-common-r1.eclass20
1 files changed, 18 insertions, 2 deletions
diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass
index b7557b130dbf..2ebad67054bf 100644
--- a/eclass/php-common-r1.eclass
+++ b/eclass/php-common-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.4 2005/11/01 10:04:13 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.5 2006/01/04 09:22:48 chtekk Exp $
# ########################################################################
#
@@ -148,7 +148,7 @@ php_check_mta() {
# ORACLE SUPPORT
# ########################################################################
-php_check_oracle() {
+php_check_oracle_all() {
if useq oci8 && [ -z "${ORACLE_HOME}" ]; then
eerror
eerror "You must have the ORACLE_HOME variable in your environment!"
@@ -164,6 +164,22 @@ php_check_oracle() {
fi
}
+php_check_oracle_8() {
+ if useq oci8 && [ -z "${ORACLE_HOME}" ]; then
+ eerror
+ eerror "You must have the ORACLE_HOME variable in your environment!"
+ eerror
+ die "Oracle configuration incorrect; user error"
+ fi
+
+ if useq oci8 ; then
+ if has_version 'dev-db/oracle-instantclient-basic' ; then
+ ewarn "Please ensure you have a full install of the Oracle client."
+ ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+ fi
+ fi
+}
+
# ########################################################################
# END OF ECLASS
# ########################################################################