From 341a0400ba652e15a7e8a61548c87a52f4a7fdb0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Mon, 5 May 2014 19:36:35 +0200
Subject: configure: prefer g-variants

For awk and make, we currently check the standard names as found on
a classic GNU-userland system, and then fallback to looking for the
g-named variants as found on a *BSD system.

But it happens that the usual name might also be available on a *BSD
system, so we should first check the g-variant.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/configure.ac b/configure.ac
index 705980f..37bcba4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,7 +195,7 @@ AC_CACHE_VAL([ac_cv_path__AWK],
                        [Specify the full PATH to GNU awk]),
         [ac_cv_path__AWK=$withval])])
 AC_CACHE_CHECK([for GNU awk], [ac_cv_path__AWK],
-    [AC_PATH_PROGS_FEATURE_CHECK([_AWK], [awk gawk],
+    [AC_PATH_PROGS_FEATURE_CHECK([_AWK], [gawk awk],
         [[_AWK_ver=$($ac_path__AWK --version 2>&1 \
                      |$EGREP '^GNU Awk ')
           test -n "$_AWK_ver" && ac_cv_path__AWK=$ac_path__AWK ac_path__AWK_found=:]],
@@ -211,7 +211,7 @@ AC_CACHE_VAL([ac_cv_path_MAKE],
                        [Specify the full PATH to GNU make >= 3.80]),
         [ac_cv_path_MAKE=$withval])])
 AC_CACHE_CHECK([for GNU make >= 3.80], [ac_cv_path_MAKE],
-    [AC_PATH_PROGS_FEATURE_CHECK([MAKE], [make gmake],
+    [AC_PATH_PROGS_FEATURE_CHECK([MAKE], [gmake make],
         [[MAKE_ver=$($ac_path_MAKE --version 2>&1 \
                      |$EGREP '^GNU Make (3.[89][[:digit:]]|[4-9])')
           test -n "$MAKE_ver" && ac_cv_path_MAKE=$ac_path_MAKE ac_path_MAKE_found=:]],
-- 
cgit v0.10.2-6-g49f6