diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2004-07-14 22:33:50 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2004-07-14 22:33:50 +0000 |
| commit | 88ccc0fecb3f89027603d595d8f4f5156a952f3d (patch) | |
| tree | fedc80467e12d170d9153997e5e9f496a37d430e /eclass | |
| parent | use gnuconfig_update regardless of arch (Manifest recommit) (diff) | |
| download | gentoo-2-88ccc0fecb3f89027603d595d8f4f5156a952f3d.tar.gz gentoo-2-88ccc0fecb3f89027603d595d8f4f5156a952f3d.tar.bz2 gentoo-2-88ccc0fecb3f89027603d595d8f4f5156a952f3d.zip | |
Fixed for passing additional parameters to --enable and --with
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/confutils.eclass | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/eclass/confutils.eclass b/eclass/confutils.eclass index eae4ae2ba217..05182d54f421 100644 --- a/eclass/confutils.eclass +++ b/eclass/confutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.2 2004/07/14 21:24:06 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.3 2004/07/14 22:33:50 stuart Exp $ # # eclass/confutils.eclass # Utility functions to help with configuring a package @@ -189,10 +189,9 @@ enable_extension_disable () { enable_extension_enable () { local my_shared - if [ "$3" == "1" ]; then - my_shared="$shared" + if [ "$3" == "1" -a -n "$shared" ]; then if [ "$4+" != "+" ]; then - my_shared="${my_shared},$4" + my_shared="${shared},$4" fi else if [ "$4+" != "+" ]; then @@ -237,10 +236,9 @@ enable_extension_without () { enable_extension_with () { local my_shared - if [ "$3" == "1" ]; then - my_shared="$shared" + if [ "$3" == "1" -a -n "$shared" ]; then if [ "$4+" != "+" ]; then - my_shared="${my_shared},$4" + my_shared="${shared},$4" fi else if [ "$4+" != "+" ]; then |