From da3930e4882e5f3d50c5583bff2d097af4607db8 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Tue, 1 Sep 2020 09:49:46 -0600 Subject: [PATCH] configure: fix test for rust headers for cross compile Use "if test ..." instead of AC_CHECK_FILES which does not work when cross compiling. --- configure.ac | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f51d7b2b52..a0fb7e2247 100644 --- a/configure.ac +++ b/configure.ac @@ -2596,7 +2596,22 @@ fi have_cargo_vendor=$have_cargo_vendor_bin fi - AC_CHECK_FILES([$srcdir/rust/dist $srcdir/rust/gen], [have_rust_headers="yes"]) + have_rust_headers="no" + AC_MSG_CHECKING(for $srcdir/rust/dist/rust-bindings.h) + if test -f "$srcdir/rust/dist/rust-bindings.h"; then + AC_MSG_RESULT(yes) + have_rust_headers="yes" + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(for $srcdir/rust/gen/rust-bindings.h) + if test -f "$srcdir/rust/gen/rust-bindings.h"; then + AC_MSG_RESULT(yes) + have_rust_headers="yes" + else + AC_MSG_RESULT(no) + fi + fi + AC_PATH_PROG(CBINDGEN, cbindgen, "no") if test "x$CBINDGEN" != "xno"; then cbindgen_version=$(cbindgen --version | cut -d' ' -f2-) -- 2.47.2