[vlc-devel] [PATCH] Configure: find LUAC in srcdir/bin, rather than in contrib dir. If contribs were built using a prefix, ${CONTRIB_DIR} will point to that prefix and ${CONTRIB_DIR}/../bin will be an invalid location where to find luac.

Jeremy Vignelles jeremy.vignelles at dev3i.fr
Mon Jan 8 16:07:12 CET 2018


---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 030832e..e4e9c74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,8 +440,8 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
     ])
 
     dnl Newer contribs follow usual name space rules
-    AS_IF([test -x "${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}"], [
-      LUAC="${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}"
+    AS_IF([test -x "${srcdir}/contrib/bin/${host_alias}-luac${BUILDEXEEXT}"], [
+      LUAC="`cd ${srcdir} && pwd`/contrib/bin/${host_alias}-luac${BUILDEXEEXT}"
     ])
   ])
 
-- 
2.10.1.windows.1



More information about the vlc-devel mailing list