diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2003-08-03 22:26:16 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2003-08-03 22:26:16 +0000 |
| commit | 64914a0281e44e8c1ce2ae85759d893ba7b294bc (patch) | |
| tree | 012716c08c8018b7b821e98c1d4da0b9da3105e8 /eclass | |
| parent | Fix ppc-benh.patch to play nicely with coreutils-fixup.patch, bug #25833 (diff) | |
| download | gentoo-2-64914a0281e44e8c1ce2ae85759d893ba7b294bc.tar.gz gentoo-2-64914a0281e44e8c1ce2ae85759d893ba7b294bc.tar.bz2 gentoo-2-64914a0281e44e8c1ce2ae85759d893ba7b294bc.zip | |
No longer tries to add an extension that's already added
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-ext-base.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass index f2c3c884dd56..5dfa15859186 100644 --- a/eclass/php-ext-base.eclass +++ b/eclass/php-ext-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.4 2003/08/03 19:26:02 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.5 2003/08/03 22:26:16 stuart Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -23,7 +23,7 @@ EXPORT_FUNCTIONS src_install # Wether the extensions is a Zend Engine extension #(defaults to "no" and if you don't know what is it, you don't need it.) -[ -z "$PHP_EXT_ZENDEXT" ] && PHP_EXT_ZENDEXT="no" +[ -z "$PHP_EXT_ZENDEXT" ] && PHP_EXT_ZENDEXT="no" || PHP_EXT_ZENDEXT="yes" # Wether or not to add a line in the php.ini for the extension # (defaults to "yes" and shouldn't be changed in most cases) @@ -89,7 +89,7 @@ php-ext-base_addextension () { } php-ext-base_setting_is_present () { - grep "^$1=" $2 > /dev/null 2>&1 + grep "^$1=$2" $3 > /dev/null 2>&1 } php-ext-base_inifileinimage () { @@ -106,7 +106,9 @@ php-ext-base_inifileinimage () { php-ext-base_addtoinifile () { if [ "$1" != "extension" ] && [ "$1" != "zend_extension" ]; then - php-ext-base_setting_is_present $1 $3 && return + php-ext-base_setting_is_present $1 "" $3 && return + else + php-ext-base_setting_is_present "$1" "$2" "$3" && return fi php-ext-base_inifileinimage $3 |