[master] Added make tool and pkg-config tests to configure script

    Merges in rt40371.

1 files changed, 44 insertions, 0 deletions

diff --git a/configure b/configure
index 08dfc51b..fc9fc648 100755
--- a/configure
+++ b/configure
@@ -631,6 +631,7 @@ BINDDIR
 ac_prefix_program
 HAVE_ATF_FALSE
 HAVE_ATF_TRUE
+pkgcfg_found
 ATF_BIN
 ATF_LDFLAGS
 ATF_CFLAGS
@@ -5525,6 +5526,46 @@ elif test "$atf_path" != "no" ; then
     if test "$atf_pcp" = "" ; then
         as_fn_error $? "Unable to find atf files in location specified" "$LINENO" 5
     else
+        # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_pkgcfg_found+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$pkgcfg_found"; then
+  ac_cv_prog_pkgcfg_found="$pkgcfg_found" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_pkgcfg_found="pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+pkgcfg_found=$ac_cv_prog_pkgcfg_found
+if test -n "$pkgcfg_found"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkgcfg_found" >&5
+$as_echo "$pkgcfg_found" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "$pkgcfg_found" = ""; then
+            as_fn_error $? "Could not locate ATF, pkg-config not installed" "$LINENO" 5
+        fi
         ATF_CFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --cflags atf-c` -DUNIT_TEST"
         ATF_LDFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --libs atf-c`"
         if  test -f $atf_pcp/atf-sh.pc ; then
@@ -8498,6 +8539,9 @@ fi
 
 
 sh util/bindvar.sh
+if test $? -ne 0; then
+    as_fn_error $? "*** util/bindvar.sh failed" "$LINENO" 5
+fi
 
 cat > config.report << END