From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 May 2007 05:15:39 +0000 (-0000)
Subject: For bug #179380, make support for ECONF_SOURCE in the default src_compile() condition... 
X-Git-Tag: v2.2_pre1~1400
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75f4fd5ae2be58e5ebced49d1c70574b547fd2d7;p=portage.git

For bug #179380, make support for ECONF_SOURCE in the default src_compile() conditional on EAPI != 0.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8e88756fc..27dce2e28 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -565,7 +565,9 @@ src_unpack() {
 }
 
 src_compile() {
-	if [ -x "${ECONF_SOURCE:-.}/configure" ] ; then
+	if [ -x ./configure ] ; then
+		econf
+	elif [ "${EAPI:-0}" != 0 ] && [ -x "${ECONF_SOURCE:-.}/configure" ] ; then
 		econf
 	fi
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then