diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2007-10-05 21:35:26 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2007-10-05 21:35:26 +0000 |
| commit | 4ad28112705cee5edf8e78f87ef920b5ada780dd (patch) | |
| tree | 846688fd91242053964bd52c51738d88d27b6b15 /eclass/php5_2-sapi.eclass | |
| parent | Sparc stable --- part of Bug #177209 (diff) | |
| download | historical-4ad28112705cee5edf8e78f87ef920b5ada780dd.tar.gz historical-4ad28112705cee5edf8e78f87ef920b5ada780dd.tar.bz2 historical-4ad28112705cee5edf8e78f87ef920b5ada780dd.zip | |
fixing firebird and interbase support for php-4.4* and -5.2*, bug 186791
Diffstat (limited to 'eclass/php5_2-sapi.eclass')
| -rw-r--r-- | eclass/php5_2-sapi.eclass | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass index 2989f6b493ce..176e1cc4189f 100644 --- a/eclass/php5_2-sapi.eclass +++ b/eclass/php5_2-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.15 2007/09/30 12:20:10 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.16 2007/10/05 21:35:26 hoffie Exp $ # ======================================================================== # Based on robbat2's work on the php4 sapi eclass @@ -207,6 +207,7 @@ php5_2-sapi_check_use_flags() { phpconfutils_use_conflict "readline" "libedit" phpconfutils_use_conflict "recode" "mysql" "imap" "yaz" phpconfutils_use_conflict "sharedmem" "threads" + phpconfutils_use_conflict "firebird" "interbase" # IMAP support php_check_imap @@ -520,10 +521,19 @@ php5_2-sapi_src_compile() { fi # Interbase support - if use firebird || use interbase ; then + if use interbase ; then my_conf="${my_conf} --with-interbase=/opt" fi + # Firebird support - see Bug 186791 + if use firebird ; then + if has_version "<dev-db/firebird-2.0.3.12981.0-r1" ; then + my_conf="${my_conf} --with-interbase=/opt" + else + my_conf="${my_conf} --with-interbase=/usr" + fi + fi + # LDAP support if use ldap || phpconfutils_usecheck ldap ; then if use oci8 ; then |