fix thinko with array handling when injecting args into the cmdline

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 0af4563c5543bfc6d44cd476023b64e6f96fdce3..daaa4b09044f0a20ba7dd4eb96507eddd177e597 100644 (file)
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.115 2011/12/14 19:15:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.116 2011/12/14 20:46:36 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -316,10 +316,6 @@ autotools_env_setup() {
        [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 }
 autotools_run_tool() {
-       if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
-               ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
-       fi
-
        # Process our own internal flags first
        local autofail=true m4flags=false
        while [[ -n $1 ]] ; do
@@ -332,6 +328,10 @@ autotools_run_tool() {
                shift
        done
 
+       if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
+               ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
+       fi
+
        autotools_env_setup
 
        local STDERR_TARGET="${T}/$1.out"
@@ -347,7 +347,7 @@ autotools_run_tool() {
        fi
 
        if ${m4flags} ; then
-               set -- $(autotools_m4dir_include) "$@" $(autotools_m4sysdir_include)
+               set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include)
        fi
 
        printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"