From d3d4267f918806dfe3ac525412f35a811101841a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 23 Feb 2022 14:05:49 +0100
Subject: [PATCH] configure: don't check luac in deprecated path
Maybe it was OK to keep it in 3.0 but in 4.0 we can't expect to reuse ancient
folders, just to save a luac rebuild.
Also add a nice message when configuring.
---
configure.ac | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9aef1ccb3857..85004dac52e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,14 +534,12 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
AS_IF([test -z "$LUAC"], [
- dnl Old contribs mixed cross-tools and cross-compiled executables
- AS_IF([test -x "${CONTRIB_DIR}/bin/luac${BUILDEXEEXT}"], [
- LUAC="${CONTRIB_DIR}/bin/luac${BUILDEXEEXT}"
- ])
-
- dnl Newer contribs follow usual name space rules
+ AC_MSG_CHECKING([if contribs provide luac])
AS_IF([test -x "${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}"], [
LUAC="${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}"
+ AC_MSG_RESULT([yes])
+ ],[
+ AC_MSG_RESULT([no])
])
])
--
GitLab