summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/php5_1-sapi.eclass')
-rw-r--r--eclass/php5_1-sapi.eclass15
1 files changed, 12 insertions, 3 deletions
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index 66380f618e1a..d2fc8cc0043d 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.30 2006/08/06 22:51:45 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.31 2006/08/29 19:24:59 chtekk Exp $
#
# ########################################################################
#
@@ -77,6 +77,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
nls? ( sys-devel/gettext )
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
odbc? ( >=dev-db/unixODBC-1.8.13 )
+ pcre? ( dev-libs/libpcre )
postgres? ( >=dev-db/libpq-7.1 )
qdbm? ( dev-db/qdbm )
readline? ( sys-libs/readline )
@@ -89,6 +90,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
soap? ( >=dev-libs/libxml2-2.6.8 )
solid? ( >=dev-db/unixODBC-1.8.13 )
spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) )
ssl? ( >=dev-libs/openssl-0.9.7 )
sybase? ( dev-db/freetds )
tidy? ( app-text/htmltidy )
@@ -386,7 +388,6 @@ php5_1-sapi_src_compile() {
phpconfutils_extension_with "openssl" "ssl" 0
phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr"
phpconfutils_extension_enable "pcntl" "pcntl" 1
- phpconfutils_extension_without "pcre-regex" "pcre" 0
phpconfutils_extension_disable "pdo" "pdo" 0
phpconfutils_extension_with "pgsql" "postgres" 1
phpconfutils_extension_disable "posix" "posix" 0
@@ -501,6 +502,13 @@ php5_1-sapi_src_compile() {
phpconfutils_extension_with "oci8" "oci8-instant-client" 1 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
fi
+ # PCRE support
+ if useq pcre || phpconfutils_usecheck pcre ; then
+ phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
+ else
+ phpconfutils_extension_without "pcre-regex" "pcre" 0
+ fi
+
# PDO support
if useq pdo || phpconfutils_usecheck pdo ; then
phpconfutils_extension_with "pdo-dblib" "mssql" 1
@@ -517,7 +525,7 @@ php5_1-sapi_src_compile() {
fi
phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr"
phpconfutils_extension_with "pdo-pgsql" "postgres" 1
- phpconfutils_extension_with "pdo-sqlite" "sqlite" 1
+ phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "/usr"
fi
# readline/libedit support
@@ -536,6 +544,7 @@ php5_1-sapi_src_compile() {
if ! useq sqlite && ! phpconfutils_usecheck sqlite ; then
phpconfutils_extension_without "sqlite" "sqlite" 0
else
+ phpconfutils_extension_with "sqlite" "sqlite" 0 "/usr"
phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
fi