diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-06-08 17:39:16 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-06-08 17:39:16 +0000 |
| commit | 5b41ec1778eec6a63ed4af4932b54714b7451e99 (patch) | |
| tree | 30a6ff9bc1b30580642e887b671119507aafa17c /eclass/php5-sapi-r2.eclass | |
| parent | use correct eclass name in functions. (diff) | |
| download | gentoo-2-5b41ec1778eec6a63ed4af4932b54714b7451e99.tar.gz gentoo-2-5b41ec1778eec6a63ed4af4932b54714b7451e99.tar.bz2 gentoo-2-5b41ec1778eec6a63ed4af4932b54714b7451e99.zip | |
Fix bug #95465.
Diffstat (limited to 'eclass/php5-sapi-r2.eclass')
| -rw-r--r-- | eclass/php5-sapi-r2.eclass | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass index 00eef691a10f..c01025f6a278 100644 --- a/eclass/php5-sapi-r2.eclass +++ b/eclass/php5-sapi-r2.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/php5-sapi-r2.eclass,v 1.13 2005/06/03 08:42:10 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.14 2005/06/08 17:39:16 robbat2 Exp $ # # eclass/php5-sapi-r2.eclass # Eclass for building different php5 SAPI instances @@ -152,11 +152,6 @@ php5-sapi-r2_check_awkward_uses() { die "recode broken, upstream bug" fi - # iodbc support added by Tim Haynes <gentoo@stirfried.vegetable.org.uk> - if useq iodbc ; then - enable_extension_with "iodbc" "iodbc" 0 /usr - fi - # Sanity check for Oracle if useq oci8 && [ -z "${ORACLE_HOME}" ]; then eerror @@ -399,6 +394,8 @@ php5-sapi-r2_src_compile() { enable_extension_with "informix" "informix" 1 enable_extension_with "ingres" "ingres" 1 enable_extension_with "interbase" "firebird" 1 + # iodbc support added by Tim Haynes <gentoo@stirfried.vegetable.org.uk> + enable_extension_with "iodbc" "iodbc" 0 "/usr" # ircg extension not supported on Gentoo at this time enable_extension_with "kerberos" "kerberos" 0 "/usr" enable_extension_disable "libxml" "xml2" 0 @@ -446,7 +443,7 @@ php5-sapi-r2_src_compile() { enable_extension_with "zlib" "zlib" 1 enable_extension_enable "debug" "debug" 0 - php5-sapi-r1_check_awkward_uses + php5-sapi-r2_check_awkward_uses # DBA support enable_extension_enable "dba" "dba" 1 @@ -514,7 +511,6 @@ php5-sapi-r2_src_install() { # PEAR-Installer and phpconfig install the following, so we # don't have to - rm -rf ${D}/usr/bin/{php,phpextdist,phpize,php-config,pear} rm -rf ${D}/usr/lib/php/build rm -rf ${D}/usr/include/php |