From: Eric Anholt <eric@anholt.net>
Date: Sat, 22 Mar 2008 18:03:16 +0000 (-0700)
Subject: autoconf: Add a workaround for second AC_PROG_PATH not overwriting results.
X-Git-Tag: android-x86-1.6~1362
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c98642169496cfa7d8026dbd5214fafbde962002;p=android-x86%2Fexternal-mesa.git

autoconf: Add a workaround for second AC_PROG_PATH not overwriting results.
---

diff --git a/configure.ac b/configure.ac
index 99657eb20a9..8b79342e454 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,10 @@ dnl Check for progs
 AC_PROG_CPP
 AC_PROG_CC
 AC_PROG_CXX
-AC_PATH_PROG(MAKE, gmake, [not_found])
-if test "x$MAKE" = "xnot_found"; then
-	AC_PATH_PROG(MAKE, make)
+AC_PATH_PROG(GMAKE, gmake, [not_found])
+AC_PATH_PROG(MAKE, make)
+if test "x$GMAKE" != "xnot_found"; then
+	MAKE="$GMAKE"
 fi
 AC_PATH_PROG(MKDEP, makedepend)
 AC_PATH_PROG(SED, sed)