[vlc-commits] commit: Check for missing LUAC in configure rather than make, make it precious ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Sun Apr 11 08:50:06 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr 11 09:46:52 2010 +0300| [7fb93d7334588cf55a6f36f5a0dda243ae687ea8] | committer: Rémi Denis-Courmont 

Check for missing LUAC in configure rather than make, make it precious

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7fb93d7334588cf55a6f36f5a0dda243ae687ea8
---

 configure.ac      |    5 ++++-
 share/Makefile.am |    4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9fc2af9..b3e0ee2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1629,7 +1629,10 @@ then
   else
       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
   fi
-  AC_PATH_PROG(LUAC, luac)
+  AC_ARG_VAR([LUAC], [LUA byte compiler])
+  AC_PATH_PROG(LUAC, luac, [
+    AC_MSG_ERROR([Could not find the LUA byte compiler.])
+  ])
 fi
 AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
 
diff --git a/share/Makefile.am b/share/Makefile.am
index a7d0b39..59d424f 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -193,10 +193,6 @@ luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY))
 luac_verbose_0 = @echo "  LUAC   $@";
 
 .lua.luac:
-	$(AM_V_at)if test -z "$(LUAC)"; then \
-		echo "LUA byte compiler missing." >&2; \
-		exit 1 ; \
-	fi
 	$(AM_V_at)for f in $(EXTRA_DIST); do \
 		test "$(srcdir)" = . || f="$(srcdir)/$$f"; \
 		if test $$f = $<; then \



More information about the vlc-commits mailing list