(trunk r12589)

svn path=/main/branches/2.1.6/; revision=12870

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 34e4f747bf28a08658b75f62c85e71612f778378..2c46da3f996910239fe1b7856bd63e070df5d628 100755 (executable)
--- 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[= ]}))