From b645942df9779f44089029de8832928b21746173 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon, 24 Mar 2008 10:01:50 -0700
Subject: Use AC_CHECK_PROGS to find alternate make programs

The autoconf macro AC_PATH_PROGS handles the case of searching for
multiple program names already, so we don't need to open code it. Also
changed the search to AC_CHECK_PROGS so that it doesn't set the full
path unless the user specified. Finally, report back the found value at
the end for what the user should run.
---
 configure.ac | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ac4b77cef0..8598a0d2d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,7 @@ dnl Check for progs
 AC_PROG_CPP
 AC_PROG_CC
 AC_PROG_CXX
-AC_PATH_PROG(GMAKE, gmake, [not_found])
-AC_PATH_PROG(MAKE, make)
-if test "x$GMAKE" != "xnot_found"; then
-	MAKE="$GMAKE"
-fi
+AC_CHECK_PROGS(MAKE, [gmake make])
 AC_PATH_PROG(MKDEP, makedepend)
 AC_PATH_PROG(SED, sed)
 
@@ -903,5 +899,5 @@ echo "        CXXFLAGS:        $cxxflags"
 echo "        Macros:          $defines"
 
 echo ""
-echo "        Run 'make' to build Mesa"
+echo "        Run '${MAKE-make}' to build Mesa"
 echo ""
-- 
cgit v1.2.3