diff mbox series

[1/3] tools: Check for abi-compliance-checker in ./configure

Message ID 20210301170044.23295-2-andrew.cooper3@citrix.com (mailing list archive)
State New
Headers show
Series tools: ABI checking | expand

Commit Message

Andrew Cooper March 1, 2021, 5 p.m. UTC
This will be optional.  No functional change

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Jackson <iwj@xenproject.org>
CC: Wei Liu <wl@xen.org>
---
 config/Tools.mk.in |  1 +
 tools/configure    | 41 +++++++++++++++++++++++++++++++++++++++++
 tools/configure.ac |  1 +
 3 files changed, 43 insertions(+)

Comments

Ian Jackson March 1, 2021, 5:17 p.m. UTC | #1
Andrew Cooper writes ("[PATCH 1/3] tools: Check for abi-compliance-checker in ./configure"):
> This will be optional.  No functional change

Release-Acked-by: Ian Jackson <iwj@xenproject.org>
diff mbox series

Patch

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index d47936686b..8e2268da3e 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -20,6 +20,7 @@  IASL                := @IASL@
 AWK                 := @AWK@
 FETCHER             := @FETCHER@
 ABI_DUMPER          := @ABI_DUMPER@
+ABI_COMPLIANCE_CHECKER := @ABI_COMPLIANCE_CHECKER@
 
 # Extra folder for libs/includes
 PREPEND_INCLUDES    := @PREPEND_INCLUDES@
diff --git a/tools/configure b/tools/configure
index bb5acf9d43..f77bf6f66d 100755
--- a/tools/configure
+++ b/tools/configure
@@ -682,6 +682,7 @@  OCAMLOPT
 OCAMLLIB
 OCAMLVERSION
 OCAMLC
+ABI_COMPLIANCE_CHECKER
 ABI_DUMPER
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -5483,6 +5484,46 @@  $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of "abi-compliance-checker", so it can be a program name with args.
+set dummy abi-compliance-checker; 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_path_ABI_COMPLIANCE_CHECKER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ABI_COMPLIANCE_CHECKER in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ABI_COMPLIANCE_CHECKER="$ABI_COMPLIANCE_CHECKER" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ABI_COMPLIANCE_CHECKER="$as_dir/$ac_word$ac_exec_ext"
+    $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
+
+  ;;
+esac
+fi
+ABI_COMPLIANCE_CHECKER=$ac_cv_path_ABI_COMPLIANCE_CHECKER
+if test -n "$ABI_COMPLIANCE_CHECKER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABI_COMPLIANCE_CHECKER" >&5
+$as_echo "$ABI_COMPLIANCE_CHECKER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/tools/configure.ac b/tools/configure.ac
index 636e7077be..d84f2edcdc 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -311,6 +311,7 @@  AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PATH_PROG([FLEX], [flex])
 AC_PATH_PROG([ABI_DUMPER], [abi-dumper])
+AC_PATH_PROG([ABI_COMPLIANCE_CHECKER], [abi-compliance-checker])
 AX_PATH_PROG_OR_FAIL([PERL], [perl])
 AX_PATH_PROG_OR_FAIL([AWK], [awk])