diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-11-12 18:13:29 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-11-12 18:13:29 +0000 |
| commit | 6dbd2fbf72c84e3c8ef5fc83f56000f16740c4b5 (patch) | |
| tree | f69846fcdd6db640931eda2cd567afae9eaa07fc /eclass | |
| parent | Removed past non-split version that installed all under /opt/firebird (diff) | |
| download | gentoo-2-6dbd2fbf72c84e3c8ef5fc83f56000f16740c4b5.tar.gz gentoo-2-6dbd2fbf72c84e3c8ef5fc83f56000f16740c4b5.tar.bz2 gentoo-2-6dbd2fbf72c84e3c8ef5fc83f56000f16740c4b5.zip | |
Dropped conditional on firebird versions that switched paths from /opt to /usr.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php4_4-sapi.eclass | 8 | ||||
| -rw-r--r-- | eclass/php5_2-sapi.eclass | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index 628fe2e99dcd..d96ef4af8742 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-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/php4_4-sapi.eclass,v 1.41 2007/10/05 21:35:26 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.42 2007/11/12 18:13:29 wltjr Exp $ # ======================================================================== # Based on robbat2's work on the php4 sapi eclass @@ -511,11 +511,7 @@ php4_4-sapi_src_compile() { # 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 + my_conf="${my_conf} --with-interbase=/usr" fi # LDAP support diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass index 176e1cc4189f..883e83511caa 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.16 2007/10/05 21:35:26 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.17 2007/11/12 18:13:29 wltjr Exp $ # ======================================================================== # Based on robbat2's work on the php4 sapi eclass @@ -527,11 +527,7 @@ php5_2-sapi_src_compile() { # 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 + my_conf="${my_conf} --with-interbase=/usr" fi # LDAP support |