From ff5bee0ef0c0ca1ad51a3b3f3cc51b28dc3aed7c Mon Sep 17 00:00:00 2001 From: pancake Date: Sun, 12 Mar 2017 23:20:08 +0100 Subject: [PATCH] Fix #7005 - Do not check for lua --- configure | 3 +-- configure.acr | 2 -- sys/shellcheck.sh | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configure b/configure index 9dd705b15d..d4a7981bdd 100755 --- a/configure +++ b/configure @@ -308,7 +308,7 @@ parse_options "$1" shift done -ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH HAVE_LIB_LUA5_1 USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION" +ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION" create_environ @@ -476,7 +476,6 @@ if [ "$HAVE_LIB_SSL" = "0" ]; then HAVE_OPENSSL="0" else SSL_LDFLAGS="-lssl"; fi; fi -check_library HAVE_LIB_LUA5_1 lua5.1 0 if [ "$USEROSTYPE" = "auto" ]; then if [ "$HOST_OS" = "mingw32_nt-6.2" ]; then USEROSTYPE="mingw32" diff --git a/configure.acr b/configure.acr index 4eb9acf01f..1155c16387 100644 --- a/configure.acr +++ b/configure.acr @@ -82,8 +82,6 @@ IFNULL SSL_LDFLAGS { ARG_WITH USE_RPATH rpath use rpath to build ; -CHKLIB lua5.1 - (( rules for the compiler )) ARG_WITH USERCC=gcc compiler Define compiler to use (see mk/) ; ARG_WITH USEROSTYPE=auto ostype Choose OS type ( gnulinux windows darwin haiku ) ; diff --git a/sys/shellcheck.sh b/sys/shellcheck.sh index 3a7f9b1616..3bb3444aa7 100755 --- a/sys/shellcheck.sh +++ b/sys/shellcheck.sh @@ -83,7 +83,6 @@ fileslist=( ./sys/jam.sh ./sys/ldconfig.sh ./sys/locdiff -./sys/lua.sh ./sys/maemo.sh ./sys/mingw32-deps.sh ./sys/mingw32-python-deps.sh