From: Tom Rini <tom_rini@mentor.com>
Date: Thu, 18 Nov 2010 14:01:56 +0000 (-0700)
Subject: autoconf.inc: Use 'which' to find m4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8da17586c547f365ae667eb2608ba89a1c375afc;p=openembedded.git

autoconf.inc: Use 'which' to find m4

We need to make sure that if m4-native is built, it's used here
as there are hosts that otherwise have too old of an m4.  When
@M4@ is replaced here it's not used in conjunction with #! so this
is safe.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index 79a81082e9..ca6504fcfb 100644
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -21,8 +21,9 @@ SUBDIRS = "bin . lib"
 do_configure_prepend () {
 	if ${@['true', 'false'][bb.data.inherits_class('native', d)]}
 	then
+		M4=`which m4`
 		export ac_cv_path_PERL="${ac_cv_path_PERL=${bindir}/perl}"
-		export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}"
+		export ac_cv_path_M4="${ac_cv_path_M4=${M4}}"
 		export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}"
 	fi
 }