From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 7 Feb 2009 09:26:08 +0000 (-0000)
Subject: fix previous commit -- hasq isnt as cool as i thought and doesnt accept globs, so... 
X-Git-Tag: v2.2_rc24~213
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2434d0f6c4ff64070e811ed64902ad6b0722d3b9;p=portage.git

fix previous commit -- hasq isnt as cool as i thought and doesnt accept globs, so define a new hasg() func that does and use that

svn path=/main/trunk/; revision=12589
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 34e4f747b..2c46da3f9 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -455,6 +455,12 @@ strip_duplicate_slashes() {
 	fi
 }
 
+hasg() {
+    local x s=$1
+    shift
+    for x ; do [[ ${x} == ${s} ]] && echo "${x}" && return 0 ; done
+    return 1
+}
 econf() {
 	local x
 	local LOCAL_EXTRA_ECONF="${EXTRA_ECONF}"
@@ -491,7 +497,7 @@ econf() {
 			CONF_LIBDIR="${!LIBDIR_VAR}"
 		fi
 		unset LIBDIR_VAR
-		if [ -n "${CONF_LIBDIR}" ] && ! hasq --libdir=* "$@" ; then
+		if [ -n "${CONF_LIBDIR}" ] && ! hasg --libdir=* "$@" ; then
 			if [ "${*/--exec-prefix}" != "$*" ]; then
 				local args="$(echo $*)"
 				local -a pref=($(echo ${args/*--exec-prefix[= ]}))