|
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
#
|
|
|
# Filename: package/.../lua/lua-5.1.4-autotoolize.patch
|
|
|
# Copyright (C) 2012 The OpenSDE Project
|
|
|
#
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
#
|
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
|
# of the GNU General Public License as published by the Free Software
|
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
|
# version.
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
From 279c71a79496ebe58e172b21785fa32ad7e22bc5 Mon Sep 17 00:00:00 2001
|
|
|
From: Petri Lehtinen <petri@digip.org>
|
|
|
Date: Wed, 13 May 2009 12:10:32 +0300
|
|
|
Subject: [PATCH 01/11] lua-5.1.4: Autotoolize
|
|
|
|
|
|
---
|
|
|
Makefile | 128 --------
|
|
|
Makefile.am | 3 +
|
|
|
autogen.sh | 5 +
|
|
|
configure.ac | 68 ++++
|
|
|
doc/Makefile.am | 5 +
|
|
|
etc/Makefile | 44 ---
|
|
|
etc/Makefile.am | 8 +
|
|
|
etc/lua.pc | 31 --
|
|
|
etc/lua.pc.in | 13 +
|
|
|
src/Makefile | 182 -----------
|
|
|
src/Makefile.am | 45 +++
|
|
|
src/luaconf.h | 763 ---------------------------------------------
|
|
|
src/luaconf.h.template.in | 754 ++++++++++++++++++++++++++++++++++++++++++++
|
|
|
test/Makefile.am | 5 +
|
|
|
14 files changed, 906 insertions(+), 1148 deletions(-)
|
|
|
delete mode 100644 Makefile
|
|
|
create mode 100644 Makefile.am
|
|
|
create mode 100755 autogen.sh
|
|
|
create mode 100644 configure.ac
|
|
|
create mode 100644 doc/Makefile.am
|
|
|
delete mode 100644 etc/Makefile
|
|
|
create mode 100644 etc/Makefile.am
|
|
|
delete mode 100644 etc/lua.pc
|
|
|
create mode 100644 etc/lua.pc.in
|
|
|
delete mode 100644 src/Makefile
|
|
|
create mode 100644 src/Makefile.am
|
|
|
delete mode 100644 src/luaconf.h
|
|
|
create mode 100644 src/luaconf.h.template.in
|
|
|
create mode 100644 test/Makefile.am
|
|
|
|
|
|
diff --git lua-5.1.4/Makefile lua-5.1.4-autotoolize/Makefile
|
|
|
deleted file mode 100644
|
|
|
index 6e78f66..0000000
|
|
|
--- lua-5.1.4/Makefile
|
|
|
+++ /dev/null
|
|
|
@@ -1,128 +0,0 @@
|
|
|
-# makefile for installing Lua
|
|
|
-# see INSTALL for installation instructions
|
|
|
-# see src/Makefile and src/luaconf.h for further customization
|
|
|
-
|
|
|
-# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
|
|
|
-
|
|
|
-# Your platform. See PLATS for possible values.
|
|
|
-PLAT= none
|
|
|
-
|
|
|
-# Where to install. The installation starts in the src and doc directories,
|
|
|
-# so take care if INSTALL_TOP is not an absolute path.
|
|
|
-INSTALL_TOP= /usr/local
|
|
|
-INSTALL_BIN= $(INSTALL_TOP)/bin
|
|
|
-INSTALL_INC= $(INSTALL_TOP)/include
|
|
|
-INSTALL_LIB= $(INSTALL_TOP)/lib
|
|
|
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
|
|
|
-#
|
|
|
-# You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
|
|
|
-# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
|
|
|
-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
|
|
|
-INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
|
|
|
-
|
|
|
-# How to install. If your install program does not support "-p", then you
|
|
|
-# may have to run ranlib on the installed liblua.a (do "make ranlib").
|
|
|
-INSTALL= install -p
|
|
|
-INSTALL_EXEC= $(INSTALL) -m 0755
|
|
|
-INSTALL_DATA= $(INSTALL) -m 0644
|
|
|
-#
|
|
|
-# If you don't have install you can use cp instead.
|
|
|
-# INSTALL= cp -p
|
|
|
-# INSTALL_EXEC= $(INSTALL)
|
|
|
-# INSTALL_DATA= $(INSTALL)
|
|
|
-
|
|
|
-# Utilities.
|
|
|
-MKDIR= mkdir -p
|
|
|
-RANLIB= ranlib
|
|
|
-
|
|
|
-# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
|
|
|
-
|
|
|
-# Convenience platforms targets.
|
|
|
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
|
|
-
|
|
|
-# What to install.
|
|
|
-TO_BIN= lua luac
|
|
|
-TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
|
|
|
-TO_LIB= liblua.a
|
|
|
-TO_MAN= lua.1 luac.1
|
|
|
-
|
|
|
-# Lua version and release.
|
|
|
-V= 5.1
|
|
|
-R= 5.1.4
|
|
|
-
|
|
|
-all: $(PLAT)
|
|
|
-
|
|
|
-$(PLATS) clean:
|
|
|
- cd src && $(MAKE) $@
|
|
|
-
|
|
|
-test: dummy
|
|
|
- src/lua test/hello.lua
|
|
|
-
|
|
|
-install: dummy
|
|
|
- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
|
|
- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
|
|
|
- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
|
|
- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
|
|
|
- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
|
|
|
-
|
|
|
-ranlib:
|
|
|
- cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
|
|
|
-
|
|
|
-local:
|
|
|
- $(MAKE) install INSTALL_TOP=..
|
|
|
-
|
|
|
-none:
|
|
|
- @echo "Please do"
|
|
|
- @echo " make PLATFORM"
|
|
|
- @echo "where PLATFORM is one of these:"
|
|
|
- @echo " $(PLATS)"
|
|
|
- @echo "See INSTALL for complete instructions."
|
|
|
-
|
|
|
-# make may get confused with test/ and INSTALL in a case-insensitive OS
|
|
|
-dummy:
|
|
|
-
|
|
|
-# echo config parameters
|
|
|
-echo:
|
|
|
- @echo ""
|
|
|
- @echo "These are the parameters currently set in src/Makefile to build Lua $R:"
|
|
|
- @echo ""
|
|
|
- @cd src && $(MAKE) -s echo
|
|
|
- @echo ""
|
|
|
- @echo "These are the parameters currently set in Makefile to install Lua $R:"
|
|
|
- @echo ""
|
|
|
- @echo "PLAT = $(PLAT)"
|
|
|
- @echo "INSTALL_TOP = $(INSTALL_TOP)"
|
|
|
- @echo "INSTALL_BIN = $(INSTALL_BIN)"
|
|
|
- @echo "INSTALL_INC = $(INSTALL_INC)"
|
|
|
- @echo "INSTALL_LIB = $(INSTALL_LIB)"
|
|
|
- @echo "INSTALL_MAN = $(INSTALL_MAN)"
|
|
|
- @echo "INSTALL_LMOD = $(INSTALL_LMOD)"
|
|
|
- @echo "INSTALL_CMOD = $(INSTALL_CMOD)"
|
|
|
- @echo "INSTALL_EXEC = $(INSTALL_EXEC)"
|
|
|
- @echo "INSTALL_DATA = $(INSTALL_DATA)"
|
|
|
- @echo ""
|
|
|
- @echo "See also src/luaconf.h ."
|
|
|
- @echo ""
|
|
|
-
|
|
|
-# echo private config parameters
|
|
|
-pecho:
|
|
|
- @echo "V = $(V)"
|
|
|
- @echo "R = $(R)"
|
|
|
- @echo "TO_BIN = $(TO_BIN)"
|
|
|
- @echo "TO_INC = $(TO_INC)"
|
|
|
- @echo "TO_LIB = $(TO_LIB)"
|
|
|
- @echo "TO_MAN = $(TO_MAN)"
|
|
|
-
|
|
|
-# echo config parameters as Lua code
|
|
|
-# uncomment the last sed expression if you want nil instead of empty strings
|
|
|
-lecho:
|
|
|
- @echo "-- installation parameters for Lua $R"
|
|
|
- @echo "VERSION = '$V'"
|
|
|
- @echo "RELEASE = '$R'"
|
|
|
- @$(MAKE) echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/'
|
|
|
- @echo "-- EOF"
|
|
|
-
|
|
|
-# list targets that do not create files (but not all makes understand .PHONY)
|
|
|
-.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
|
|
|
-
|
|
|
-# (end of Makefile)
|
|
|
diff --git lua-5.1.4/Makefile.am lua-5.1.4-autotoolize/Makefile.am
|
|
|
new file mode 100644
|
|
|
index 0000000..e5b0801
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/Makefile.am
|
|
|
@@ -0,0 +1,3 @@
|
|
|
+SUBDIRS = src doc etc test
|
|
|
+
|
|
|
+EXTRA_DIST = autogen.sh COPYRIGHT HISTORY INSTALL MANIFEST README
|
|
|
diff --git lua-5.1.4/autogen.sh lua-5.1.4-autotoolize/autogen.sh
|
|
|
new file mode 100755
|
|
|
index 0000000..73c682f
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/autogen.sh
|
|
|
@@ -0,0 +1,5 @@
|
|
|
+#!/bin/sh
|
|
|
+
|
|
|
+autoreconf -fvi
|
|
|
+
|
|
|
+echo "Now run ./configure"
|
|
|
diff --git lua-5.1.4/configure.ac lua-5.1.4-autotoolize/configure.ac
|
|
|
new file mode 100644
|
|
|
index 0000000..a33b0b6
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/configure.ac
|
|
|
@@ -0,0 +1,68 @@
|
|
|
+AC_PREREQ(2.59)
|
|
|
+AC_INIT([Autotoolized Lua], [5.1.3], [], [lua-at])
|
|
|
+
|
|
|
+AC_CONFIG_HEADERS([config.h])
|
|
|
+AC_CONFIG_SRCDIR([src/lapi.c])
|
|
|
+
|
|
|
+AM_INIT_AUTOMAKE([1.9 foreign])
|
|
|
+
|
|
|
+AC_PROG_CC
|
|
|
+AC_PROG_LIBTOOL
|
|
|
+
|
|
|
+AC_ARG_WITH(
|
|
|
+ [readline],
|
|
|
+ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
|
|
|
+ [use_readline=$withval],
|
|
|
+ [use_readline=yes]
|
|
|
+)
|
|
|
+
|
|
|
+LUA_LIBS="-lm"
|
|
|
+
|
|
|
+# Check for readline
|
|
|
+READLINE_DEFS="#undef LUA_USE_READLINE"
|
|
|
+if test "x$use_readline" == "xyes"; then
|
|
|
+ AC_CHECK_LIB([readline], [readline], [], [use_readline=no], [-lncurses])
|
|
|
+ AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
|
|
|
+ if test "x$use_readline" == "xno"; then
|
|
|
+ AC_MSG_WARN([readline headers could not be found, disabling readline support])
|
|
|
+ else
|
|
|
+ READLINE_DEFS="#define LUA_USE_READLINE"
|
|
|
+ LUA_LIBS="$LUA_LIBS -lreadline -lncurses"
|
|
|
+ fi
|
|
|
+fi
|
|
|
+AC_SUBST(READLINE_DEFS)
|
|
|
+
|
|
|
+case "$host" in
|
|
|
+ *-mingw*) use_os=win32 ;;
|
|
|
+ *-darwin*) use_os=macosx ;;
|
|
|
+ *) use_os=posix ;;
|
|
|
+esac
|
|
|
+
|
|
|
+POSIX_DEFS="#undef LUA_USE_POSIX"
|
|
|
+LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
|
|
|
+LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
|
|
|
+
|
|
|
+if test "x$use_os" == "xwin32"; then
|
|
|
+ LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
|
|
|
+elif test "x$use_os" == "xmacosx"; then
|
|
|
+ POSIX_DEFS="#define LUA_USE_POSIX"
|
|
|
+ LUA_DL_DEFS="#define LUA_DL_DYLD"
|
|
|
+elif test "x$use_os" == "xposix"; then
|
|
|
+ POSIX_DEFS="#define LUA_USE_POSIX"
|
|
|
+ LUA_DL_DEFS="#define LUA_DL_DLOPEN"
|
|
|
+ LUA_LIBS="$LUA_LIBS -ldl"
|
|
|
+fi
|
|
|
+AC_SUBST(POSIX_DEFS)
|
|
|
+AC_SUBST(LUA_DL_DEFS)
|
|
|
+AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
|
|
|
+
|
|
|
+AC_SUBST(LUA_LIBS)
|
|
|
+
|
|
|
+AC_CONFIG_FILES([Makefile
|
|
|
+ src/Makefile
|
|
|
+ src/luaconf.h.template
|
|
|
+ etc/Makefile
|
|
|
+ etc/lua.pc
|
|
|
+ doc/Makefile
|
|
|
+ test/Makefile])
|
|
|
+AC_OUTPUT
|
|
|
diff --git lua-5.1.4/doc/Makefile.am lua-5.1.4-autotoolize/doc/Makefile.am
|
|
|
new file mode 100644
|
|
|
index 0000000..24b4044
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/doc/Makefile.am
|
|
|
@@ -0,0 +1,5 @@
|
|
|
+man1_MANS = lua.1 luac.1
|
|
|
+
|
|
|
+EXTRA_DIST = \
|
|
|
+ contents.html lua.1 luac.html lua.html manual.html \
|
|
|
+ logo.gif luac.1 lua.css readme.html
|
|
|
\ No newline at end of file
|
|
|
diff --git lua-5.1.4/etc/Makefile lua-5.1.4-autotoolize/etc/Makefile
|
|
|
deleted file mode 100644
|
|
|
index 6d00008..0000000
|
|
|
--- lua-5.1.4/etc/Makefile
|
|
|
+++ /dev/null
|
|
|
@@ -1,44 +0,0 @@
|
|
|
-# makefile for Lua etc
|
|
|
-
|
|
|
-TOP= ..
|
|
|
-LIB= $(TOP)/src
|
|
|
-INC= $(TOP)/src
|
|
|
-BIN= $(TOP)/src
|
|
|
-SRC= $(TOP)/src
|
|
|
-TST= $(TOP)/test
|
|
|
-
|
|
|
-CC= gcc
|
|
|
-CFLAGS= -O2 -Wall -I$(INC) $(MYCFLAGS)
|
|
|
-MYCFLAGS=
|
|
|
-MYLDFLAGS= -Wl,-E
|
|
|
-MYLIBS= -lm
|
|
|
-#MYLIBS= -lm -Wl,-E -ldl -lreadline -lhistory -lncurses
|
|
|
-RM= rm -f
|
|
|
-
|
|
|
-default:
|
|
|
- @echo 'Please choose a target: min noparser one strict clean'
|
|
|
-
|
|
|
-min: min.c
|
|
|
- $(CC) $(CFLAGS) $@.c -L$(LIB) -llua $(MYLIBS)
|
|
|
- echo 'print"Hello there!"' | ./a.out
|
|
|
-
|
|
|
-noparser: noparser.o
|
|
|
- $(CC) noparser.o $(SRC)/lua.o -L$(LIB) -llua $(MYLIBS)
|
|
|
- $(BIN)/luac $(TST)/hello.lua
|
|
|
- -./a.out luac.out
|
|
|
- -./a.out -e'a=1'
|
|
|
-
|
|
|
-one:
|
|
|
- $(CC) $(CFLAGS) all.c $(MYLIBS)
|
|
|
- ./a.out $(TST)/hello.lua
|
|
|
-
|
|
|
-strict:
|
|
|
- -$(BIN)/lua -e 'print(a);b=2'
|
|
|
- -$(BIN)/lua -lstrict -e 'print(a)'
|
|
|
- -$(BIN)/lua -e 'function f() b=2 end f()'
|
|
|
- -$(BIN)/lua -lstrict -e 'function f() b=2 end f()'
|
|
|
-
|
|
|
-clean:
|
|
|
- $(RM) a.out core core.* *.o luac.out
|
|
|
-
|
|
|
-.PHONY: default min noparser one strict clean
|
|
|
diff --git lua-5.1.4/etc/Makefile.am lua-5.1.4-autotoolize/etc/Makefile.am
|
|
|
new file mode 100644
|
|
|
index 0000000..23edd92
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/etc/Makefile.am
|
|
|
@@ -0,0 +1,8 @@
|
|
|
+include_HEADERS = lua.hpp
|
|
|
+
|
|
|
+pkgconfigdir = $(libdir)/pkgconfig
|
|
|
+pkgconfig_DATA = lua.pc
|
|
|
+
|
|
|
+EXTRA_DIST = \
|
|
|
+ all.c lua.ico lua.pc.in noparser.c strict.lua \
|
|
|
+ luavs.bat min.c README
|
|
|
diff --git lua-5.1.4/etc/lua.pc lua-5.1.4-autotoolize/etc/lua.pc
|
|
|
deleted file mode 100644
|
|
|
index f52f55b..0000000
|
|
|
--- lua-5.1.4/etc/lua.pc
|
|
|
+++ /dev/null
|
|
|
@@ -1,31 +0,0 @@
|
|
|
-# lua.pc -- pkg-config data for Lua
|
|
|
-
|
|
|
-# vars from install Makefile
|
|
|
-
|
|
|
-# grep '^V=' ../Makefile
|
|
|
-V= 5.1
|
|
|
-# grep '^R=' ../Makefile
|
|
|
-R= 5.1.4
|
|
|
-
|
|
|
-# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
|
|
|
-prefix= /usr/local
|
|
|
-INSTALL_BIN= ${prefix}/bin
|
|
|
-INSTALL_INC= ${prefix}/include
|
|
|
-INSTALL_LIB= ${prefix}/lib
|
|
|
-INSTALL_MAN= ${prefix}/man/man1
|
|
|
-INSTALL_LMOD= ${prefix}/share/lua/${V}
|
|
|
-INSTALL_CMOD= ${prefix}/lib/lua/${V}
|
|
|
-
|
|
|
-# canonical vars
|
|
|
-exec_prefix=${prefix}
|
|
|
-libdir=${exec_prefix}/lib
|
|
|
-includedir=${prefix}/include
|
|
|
-
|
|
|
-Name: Lua
|
|
|
-Description: An Extensible Extension Language
|
|
|
-Version: ${R}
|
|
|
-Requires:
|
|
|
-Libs: -L${libdir} -llua -lm
|
|
|
-Cflags: -I${includedir}
|
|
|
-
|
|
|
-# (end of lua.pc)
|
|
|
diff --git lua-5.1.4/etc/lua.pc.in lua-5.1.4-autotoolize/etc/lua.pc.in
|
|
|
new file mode 100644
|
|
|
index 0000000..f6f0909
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/etc/lua.pc.in
|
|
|
@@ -0,0 +1,13 @@
|
|
|
+V= 5.1
|
|
|
+R= 5.1.3
|
|
|
+prefix= @prefix@
|
|
|
+exec_prefix=${prefix}
|
|
|
+libdir= @libdir@
|
|
|
+includedir=${prefix}/include
|
|
|
+
|
|
|
+Name: Lua
|
|
|
+Description: An Extensible Extension Language
|
|
|
+Version: ${R}
|
|
|
+Requires:
|
|
|
+Libs: -llua @LUA_LIBS@
|
|
|
+Cflags: -I${includedir}
|
|
|
diff --git lua-5.1.4/src/Makefile lua-5.1.4-autotoolize/src/Makefile
|
|
|
deleted file mode 100644
|
|
|
index e4a3cd6..0000000
|
|
|
--- lua-5.1.4/src/Makefile
|
|
|
+++ /dev/null
|
|
|
@@ -1,182 +0,0 @@
|
|
|
-# makefile for building Lua
|
|
|
-# see ../INSTALL for installation instructions
|
|
|
-# see ../Makefile and luaconf.h for further customization
|
|
|
-
|
|
|
-# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
|
|
|
-
|
|
|
-# Your platform. See PLATS for possible values.
|
|
|
-PLAT= none
|
|
|
-
|
|
|
-CC= gcc
|
|
|
-CFLAGS= -O2 -Wall $(MYCFLAGS)
|
|
|
-AR= ar rcu
|
|
|
-RANLIB= ranlib
|
|
|
-RM= rm -f
|
|
|
-LIBS= -lm $(MYLIBS)
|
|
|
-
|
|
|
-MYCFLAGS=
|
|
|
-MYLDFLAGS=
|
|
|
-MYLIBS=
|
|
|
-
|
|
|
-# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
|
|
|
-
|
|
|
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
|
|
-
|
|
|
-LUA_A= liblua.a
|
|
|
-CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
|
|
|
- lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
|
|
|
- lundump.o lvm.o lzio.o
|
|
|
-LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
|
|
|
- lstrlib.o loadlib.o linit.o
|
|
|
-
|
|
|
-LUA_T= lua
|
|
|
-LUA_O= lua.o
|
|
|
-
|
|
|
-LUAC_T= luac
|
|
|
-LUAC_O= luac.o print.o
|
|
|
-
|
|
|
-ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
|
|
|
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
|
|
-ALL_A= $(LUA_A)
|
|
|
-
|
|
|
-default: $(PLAT)
|
|
|
-
|
|
|
-all: $(ALL_T)
|
|
|
-
|
|
|
-o: $(ALL_O)
|
|
|
-
|
|
|
-a: $(ALL_A)
|
|
|
-
|
|
|
-$(LUA_A): $(CORE_O) $(LIB_O)
|
|
|
- $(AR) $@ $?
|
|
|
- $(RANLIB) $@
|
|
|
-
|
|
|
-$(LUA_T): $(LUA_O) $(LUA_A)
|
|
|
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
|
|
-
|
|
|
-$(LUAC_T): $(LUAC_O) $(LUA_A)
|
|
|
- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
|
|
-
|
|
|
-clean:
|
|
|
- $(RM) $(ALL_T) $(ALL_O)
|
|
|
-
|
|
|
-depend:
|
|
|
- @$(CC) $(CFLAGS) -MM l*.c print.c
|
|
|
-
|
|
|
-echo:
|
|
|
- @echo "PLAT = $(PLAT)"
|
|
|
- @echo "CC = $(CC)"
|
|
|
- @echo "CFLAGS = $(CFLAGS)"
|
|
|
- @echo "AR = $(AR)"
|
|
|
- @echo "RANLIB = $(RANLIB)"
|
|
|
- @echo "RM = $(RM)"
|
|
|
- @echo "MYCFLAGS = $(MYCFLAGS)"
|
|
|
- @echo "MYLDFLAGS = $(MYLDFLAGS)"
|
|
|
- @echo "MYLIBS = $(MYLIBS)"
|
|
|
-
|
|
|
-# convenience targets for popular platforms
|
|
|
-
|
|
|
-none:
|
|
|
- @echo "Please choose a platform:"
|
|
|
- @echo " $(PLATS)"
|
|
|
-
|
|
|
-aix:
|
|
|
- $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
|
|
|
-
|
|
|
-ansi:
|
|
|
- $(MAKE) all MYCFLAGS=-DLUA_ANSI
|
|
|
-
|
|
|
-bsd:
|
|
|
- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
|
|
|
-
|
|
|
-freebsd:
|
|
|
- $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
|
|
|
-
|
|
|
-generic:
|
|
|
- $(MAKE) all MYCFLAGS=
|
|
|
-
|
|
|
-linux:
|
|
|
- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
|
|
|
-
|
|
|
-macosx:
|
|
|
- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
|
|
|
-# use this on Mac OS X 10.3-
|
|
|
-# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
|
|
|
-
|
|
|
-mingw:
|
|
|
- $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
|
|
|
- "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
|
|
|
- "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
|
|
|
- $(MAKE) "LUAC_T=luac.exe" luac.exe
|
|
|
-
|
|
|
-posix:
|
|
|
- $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
|
|
|
-
|
|
|
-solaris:
|
|
|
- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
|
|
|
-
|
|
|
-# list targets that do not create files (but not all makes understand .PHONY)
|
|
|
-.PHONY: all $(PLATS) default o a clean depend echo none
|
|
|
-
|
|
|
-# DO NOT DELETE
|
|
|
-
|
|
|
-lapi.o: lapi.c lua.h luaconf.h lapi.h lobject.h llimits.h ldebug.h \
|
|
|
- lstate.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h \
|
|
|
- lundump.h lvm.h
|
|
|
-lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h
|
|
|
-lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
|
|
|
- lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \
|
|
|
- ltable.h
|
|
|
-ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-ldebug.o: ldebug.c lua.h luaconf.h lapi.h lobject.h llimits.h lcode.h \
|
|
|
- llex.h lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \
|
|
|
- lfunc.h lstring.h lgc.h ltable.h lvm.h
|
|
|
-ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
|
|
|
- lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h lstring.h \
|
|
|
- ltable.h lundump.h lvm.h
|
|
|
-ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \
|
|
|
- lzio.h lmem.h lundump.h
|
|
|
-lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h lmem.h \
|
|
|
- lstate.h ltm.h lzio.h
|
|
|
-lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
|
|
|
- lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h
|
|
|
-linit.o: linit.c lua.h luaconf.h lualib.h lauxlib.h
|
|
|
-liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-llex.o: llex.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h ltm.h \
|
|
|
- lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h
|
|
|
-lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
|
|
|
- ltm.h lzio.h lmem.h ldo.h
|
|
|
-loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
|
|
|
- ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
|
|
|
-lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h
|
|
|
-loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
|
|
|
- lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \
|
|
|
- lfunc.h lstring.h lgc.h ltable.h
|
|
|
-lstate.o: lstate.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
|
|
|
- ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h llex.h lstring.h ltable.h
|
|
|
-lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \
|
|
|
- ltm.h lzio.h lstring.h lgc.h
|
|
|
-lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-ltable.o: ltable.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
|
|
|
- ltm.h lzio.h lmem.h ldo.h lgc.h ltable.h
|
|
|
-ltablib.o: ltablib.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \
|
|
|
- lmem.h lstring.h lgc.h ltable.h
|
|
|
-lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h
|
|
|
-luac.o: luac.c lua.h luaconf.h lauxlib.h ldo.h lobject.h llimits.h \
|
|
|
- lstate.h ltm.h lzio.h lmem.h lfunc.h lopcodes.h lstring.h lgc.h \
|
|
|
- lundump.h
|
|
|
-lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \
|
|
|
- llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h lundump.h
|
|
|
-lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
|
|
|
- lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h
|
|
|
-lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
|
|
|
- lzio.h
|
|
|
-print.o: print.c ldebug.h lstate.h lua.h luaconf.h lobject.h llimits.h \
|
|
|
- ltm.h lzio.h lmem.h lopcodes.h lundump.h
|
|
|
-
|
|
|
-# (end of Makefile)
|
|
|
diff --git lua-5.1.4/src/Makefile.am lua-5.1.4-autotoolize/src/Makefile.am
|
|
|
new file mode 100644
|
|
|
index 0000000..6fbf296
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/src/Makefile.am
|
|
|
@@ -0,0 +1,45 @@
|
|
|
+AM_CFLAGS = -Wall
|
|
|
+
|
|
|
+include_HEADERS = lua.h lualib.h lauxlib.h
|
|
|
+nodist_include_HEADERS = luaconf.h
|
|
|
+
|
|
|
+lib_LTLIBRARIES = liblua.la
|
|
|
+liblua_la_LDFLAGS = -release 5.1
|
|
|
+liblua_la_SOURCES = \
|
|
|
+ lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c \
|
|
|
+ lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c \
|
|
|
+ lundump.c lvm.c lzio.c \
|
|
|
+ lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c loslib.c ltablib.c \
|
|
|
+ lstrlib.c loadlib.c linit.c \
|
|
|
+ lapi.h ldebug.h lgc.h lmem.h lparser.h ltable.h lzio.h ldo.h llex.h \
|
|
|
+ lobject.h lstate.h ltm.h lundump.h lcode.h lfunc.h llimits.h lopcodes.h \
|
|
|
+ lstring.h lvm.h
|
|
|
+
|
|
|
+bin_PROGRAMS = lua luac
|
|
|
+
|
|
|
+lua_SOURCES = lua.c
|
|
|
+lua_LDADD = liblua.la @LUA_LIBS@
|
|
|
+lua_DEPENDENCIES = liblua.la
|
|
|
+
|
|
|
+luac_SOURCES = luac.c print.c
|
|
|
+luac_LDADD = liblua.la @LUA_LIBS@
|
|
|
+luac_DEPENDENCIES = liblua.la
|
|
|
+
|
|
|
+# luac must be linked statically because it uses functions that
|
|
|
+# don't get exported to the shared object
|
|
|
+luac_LDFLAGS = -static
|
|
|
+
|
|
|
+EXTRA_DIST = luaconf.h.template.in
|
|
|
+BUILT_SOURCES = luaconf.h
|
|
|
+CLEANFILES = luaconf.h
|
|
|
+
|
|
|
+readline_defs = @READLINE_DEFS@
|
|
|
+
|
|
|
+edit = sed \
|
|
|
+ -e 's,%lua_datadir%,$(datadir),g' \
|
|
|
+ -e 's,%lua_libdir%,$(libdir),g'
|
|
|
+
|
|
|
+luaconf.h : $(srcdir)/luaconf.h.template
|
|
|
+ rm -f luaconf.h luaconf.h.tmp
|
|
|
+ $(edit) $(srcdir)/luaconf.h.template > luaconf.h.tmp
|
|
|
+ mv luaconf.h.tmp luaconf.h
|
|
|
diff --git lua-5.1.4/src/luaconf.h lua-5.1.4-autotoolize/src/luaconf.h
|
|
|
deleted file mode 100644
|
|
|
index e2cb261..0000000
|
|
|
--- lua-5.1.4/src/luaconf.h
|
|
|
+++ /dev/null
|
|
|
@@ -1,763 +0,0 @@
|
|
|
-/*
|
|
|
-** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
|
|
|
-** Configuration file for Lua
|
|
|
-** See Copyright Notice in lua.h
|
|
|
-*/
|
|
|
-
|
|
|
-
|
|
|
-#ifndef lconfig_h
|
|
|
-#define lconfig_h
|
|
|
-
|
|
|
-#include <limits.h>
|
|
|
-#include <stddef.h>
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-** ==================================================================
|
|
|
-** Search for "@@" to find all configurable definitions.
|
|
|
-** ===================================================================
|
|
|
-*/
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_ANSI controls the use of non-ansi features.
|
|
|
-** CHANGE it (define it) if you want Lua to avoid the use of any
|
|
|
-** non-ansi feature or library.
|
|
|
-*/
|
|
|
-#if defined(__STRICT_ANSI__)
|
|
|
-#define LUA_ANSI
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-#if !defined(LUA_ANSI) && defined(_WIN32)
|
|
|
-#define LUA_WIN
|
|
|
-#endif
|
|
|
-
|
|
|
-#if defined(LUA_USE_LINUX)
|
|
|
-#define LUA_USE_POSIX
|
|
|
-#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
|
|
|
-#define LUA_USE_READLINE /* needs some extra libraries */
|
|
|
-#endif
|
|
|
-
|
|
|
-#if defined(LUA_USE_MACOSX)
|
|
|
-#define LUA_USE_POSIX
|
|
|
-#define LUA_DL_DYLD /* does not need extra library */
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_USE_POSIX includes all functionallity listed as X/Open System
|
|
|
-@* Interfaces Extension (XSI).
|
|
|
-** CHANGE it (define it) if your system is XSI compatible.
|
|
|
-*/
|
|
|
-#if defined(LUA_USE_POSIX)
|
|
|
-#define LUA_USE_MKSTEMP
|
|
|
-#define LUA_USE_ISATTY
|
|
|
-#define LUA_USE_POPEN
|
|
|
-#define LUA_USE_ULONGJMP
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_PATH and LUA_CPATH are the names of the environment variables that
|
|
|
-@* Lua check to set its paths.
|
|
|
-@@ LUA_INIT is the name of the environment variable that Lua
|
|
|
-@* checks for initialization code.
|
|
|
-** CHANGE them if you want different names.
|
|
|
-*/
|
|
|
-#define LUA_PATH "LUA_PATH"
|
|
|
-#define LUA_CPATH "LUA_CPATH"
|
|
|
-#define LUA_INIT "LUA_INIT"
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
|
|
|
-@* Lua libraries.
|
|
|
-@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
|
|
|
-@* C libraries.
|
|
|
-** CHANGE them if your machine has a non-conventional directory
|
|
|
-** hierarchy or if you want to install your libraries in
|
|
|
-** non-conventional directories.
|
|
|
-*/
|
|
|
-#if defined(_WIN32)
|
|
|
-/*
|
|
|
-** In Windows, any exclamation mark ('!') in the path is replaced by the
|
|
|
-** path of the directory of the executable file of the current process.
|
|
|
-*/
|
|
|
-#define LUA_LDIR "!\\lua\\"
|
|
|
-#define LUA_CDIR "!\\"
|
|
|
-#define LUA_PATH_DEFAULT \
|
|
|
- ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
|
|
|
- LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua"
|
|
|
-#define LUA_CPATH_DEFAULT \
|
|
|
- ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
|
|
|
-
|
|
|
-#else
|
|
|
-#define LUA_ROOT "/usr/local/"
|
|
|
-#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
|
|
|
-#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
|
|
|
-#define LUA_PATH_DEFAULT \
|
|
|
- "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
|
|
|
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
|
|
|
-#define LUA_CPATH_DEFAULT \
|
|
|
- "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_DIRSEP is the directory separator (for submodules).
|
|
|
-** CHANGE it if your machine does not use "/" as the directory separator
|
|
|
-** and is not Windows. (On Windows Lua automatically uses "\".)
|
|
|
-*/
|
|
|
-#if defined(_WIN32)
|
|
|
-#define LUA_DIRSEP "\\"
|
|
|
-#else
|
|
|
-#define LUA_DIRSEP "/"
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_PATHSEP is the character that separates templates in a path.
|
|
|
-@@ LUA_PATH_MARK is the string that marks the substitution points in a
|
|
|
-@* template.
|
|
|
-@@ LUA_EXECDIR in a Windows path is replaced by the executable's
|
|
|
-@* directory.
|
|
|
-@@ LUA_IGMARK is a mark to ignore all before it when bulding the
|
|
|
-@* luaopen_ function name.
|
|
|
-** CHANGE them if for some reason your system cannot use those
|
|
|
-** characters. (E.g., if one of those characters is a common character
|
|
|
-** in file/directory names.) Probably you do not need to change them.
|
|
|
-*/
|
|
|
-#define LUA_PATHSEP ";"
|
|
|
-#define LUA_PATH_MARK "?"
|
|
|
-#define LUA_EXECDIR "!"
|
|
|
-#define LUA_IGMARK "-"
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
|
|
|
-** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
|
|
|
-** machines, ptrdiff_t gives a good choice between int or long.)
|
|
|
-*/
|
|
|
-#define LUA_INTEGER ptrdiff_t
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_API is a mark for all core API functions.
|
|
|
-@@ LUALIB_API is a mark for all standard library functions.
|
|
|
-** CHANGE them if you need to define those functions in some special way.
|
|
|
-** For instance, if you want to create one Windows DLL with the core and
|
|
|
-** the libraries, you may want to use the following definition (define
|
|
|
-** LUA_BUILD_AS_DLL to get it).
|
|
|
-*/
|
|
|
-#if defined(LUA_BUILD_AS_DLL)
|
|
|
-
|
|
|
-#if defined(LUA_CORE) || defined(LUA_LIB)
|
|
|
-#define LUA_API __declspec(dllexport)
|
|
|
-#else
|
|
|
-#define LUA_API __declspec(dllimport)
|
|
|
-#endif
|
|
|
-
|
|
|
-#else
|
|
|
-
|
|
|
-#define LUA_API extern
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-/* more often than not the libs go together with the core */
|
|
|
-#define LUALIB_API LUA_API
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_FUNC is a mark for all extern functions that are not to be
|
|
|
-@* exported to outside modules.
|
|
|
-@@ LUAI_DATA is a mark for all extern (const) variables that are not to
|
|
|
-@* be exported to outside modules.
|
|
|
-** CHANGE them if you need to mark them in some special way. Elf/gcc
|
|
|
-** (versions 3.2 and later) mark them as "hidden" to optimize access
|
|
|
-** when Lua is compiled as a shared library.
|
|
|
-*/
|
|
|
-#if defined(luaall_c)
|
|
|
-#define LUAI_FUNC static
|
|
|
-#define LUAI_DATA /* empty */
|
|
|
-
|
|
|
-#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
|
|
|
- defined(__ELF__)
|
|
|
-#define LUAI_FUNC __attribute__((visibility("hidden"))) extern
|
|
|
-#define LUAI_DATA LUAI_FUNC
|
|
|
-
|
|
|
-#else
|
|
|
-#define LUAI_FUNC extern
|
|
|
-#define LUAI_DATA extern
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_QL describes how error messages quote program elements.
|
|
|
-** CHANGE it if you want a different appearance.
|
|
|
-*/
|
|
|
-#define LUA_QL(x) "'" x "'"
|
|
|
-#define LUA_QS LUA_QL("%s")
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_IDSIZE gives the maximum size for the description of the source
|
|
|
-@* of a function in debug information.
|
|
|
-** CHANGE it if you want a different size.
|
|
|
-*/
|
|
|
-#define LUA_IDSIZE 60
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-** {==================================================================
|
|
|
-** Stand-alone configuration
|
|
|
-** ===================================================================
|
|
|
-*/
|
|
|
-
|
|
|
-#if defined(lua_c) || defined(luaall_c)
|
|
|
-
|
|
|
-/*
|
|
|
-@@ lua_stdin_is_tty detects whether the standard input is a 'tty' (that
|
|
|
-@* is, whether we're running lua interactively).
|
|
|
-** CHANGE it if you have a better definition for non-POSIX/non-Windows
|
|
|
-** systems.
|
|
|
-*/
|
|
|
-#if defined(LUA_USE_ISATTY)
|
|
|
-#include <unistd.h>
|
|
|
-#define lua_stdin_is_tty() isatty(0)
|
|
|
-#elif defined(LUA_WIN)
|
|
|
-#include <io.h>
|
|
|
-#include <stdio.h>
|
|
|
-#define lua_stdin_is_tty() _isatty(_fileno(stdin))
|
|
|
-#else
|
|
|
-#define lua_stdin_is_tty() 1 /* assume stdin is a tty */
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_PROMPT is the default prompt used by stand-alone Lua.
|
|
|
-@@ LUA_PROMPT2 is the default continuation prompt used by stand-alone Lua.
|
|
|
-** CHANGE them if you want different prompts. (You can also change the
|
|
|
-** prompts dynamically, assigning to globals _PROMPT/_PROMPT2.)
|
|
|
-*/
|
|
|
-#define LUA_PROMPT "> "
|
|
|
-#define LUA_PROMPT2 ">> "
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_PROGNAME is the default name for the stand-alone Lua program.
|
|
|
-** CHANGE it if your stand-alone interpreter has a different name and
|
|
|
-** your system is not able to detect that name automatically.
|
|
|
-*/
|
|
|
-#define LUA_PROGNAME "lua"
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_MAXINPUT is the maximum length for an input line in the
|
|
|
-@* stand-alone interpreter.
|
|
|
-** CHANGE it if you need longer lines.
|
|
|
-*/
|
|
|
-#define LUA_MAXINPUT 512
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ lua_readline defines how to show a prompt and then read a line from
|
|
|
-@* the standard input.
|
|
|
-@@ lua_saveline defines how to "save" a read line in a "history".
|
|
|
-@@ lua_freeline defines how to free a line read by lua_readline.
|
|
|
-** CHANGE them if you want to improve this functionality (e.g., by using
|
|
|
-** GNU readline and history facilities).
|
|
|
-*/
|
|
|
-#if defined(LUA_USE_READLINE)
|
|
|
-#include <stdio.h>
|
|
|
-#include <readline/readline.h>
|
|
|
-#include <readline/history.h>
|
|
|
-#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
|
|
|
-#define lua_saveline(L,idx) \
|
|
|
- if (lua_strlen(L,idx) > 0) /* non-empty line? */ \
|
|
|
- add_history(lua_tostring(L, idx)); /* add it to history */
|
|
|
-#define lua_freeline(L,b) ((void)L, free(b))
|
|
|
-#else
|
|
|
-#define lua_readline(L,b,p) \
|
|
|
- ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
|
|
|
- fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */
|
|
|
-#define lua_saveline(L,idx) { (void)L; (void)idx; }
|
|
|
-#define lua_freeline(L,b) { (void)L; (void)b; }
|
|
|
-#endif
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-/* }================================================================== */
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_GCPAUSE defines the default pause between garbage-collector cycles
|
|
|
-@* as a percentage.
|
|
|
-** CHANGE it if you want the GC to run faster or slower (higher values
|
|
|
-** mean larger pauses which mean slower collection.) You can also change
|
|
|
-** this value dynamically.
|
|
|
-*/
|
|
|
-#define LUAI_GCPAUSE 200 /* 200% (wait memory to double before next GC) */
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_GCMUL defines the default speed of garbage collection relative to
|
|
|
-@* memory allocation as a percentage.
|
|
|
-** CHANGE it if you want to change the granularity of the garbage
|
|
|
-** collection. (Higher values mean coarser collections. 0 represents
|
|
|
-** infinity, where each step performs a full collection.) You can also
|
|
|
-** change this value dynamically.
|
|
|
-*/
|
|
|
-#define LUAI_GCMUL 200 /* GC runs 'twice the speed' of memory allocation */
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_GETN controls compatibility with old getn behavior.
|
|
|
-** CHANGE it (define it) if you want exact compatibility with the
|
|
|
-** behavior of setn/getn in Lua 5.0.
|
|
|
-*/
|
|
|
-#undef LUA_COMPAT_GETN
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_LOADLIB controls compatibility about global loadlib.
|
|
|
-** CHANGE it to undefined as soon as you do not need a global 'loadlib'
|
|
|
-** function (the function is still available as 'package.loadlib').
|
|
|
-*/
|
|
|
-#undef LUA_COMPAT_LOADLIB
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_VARARG controls compatibility with old vararg feature.
|
|
|
-** CHANGE it to undefined as soon as your programs use only '...' to
|
|
|
-** access vararg parameters (instead of the old 'arg' table).
|
|
|
-*/
|
|
|
-#define LUA_COMPAT_VARARG
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
|
|
|
-** CHANGE it to undefined as soon as your programs use 'math.fmod' or
|
|
|
-** the new '%' operator instead of 'math.mod'.
|
|
|
-*/
|
|
|
-#define LUA_COMPAT_MOD
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
|
|
|
-@* facility.
|
|
|
-** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
|
|
|
-** off the advisory error when nesting [[...]].
|
|
|
-*/
|
|
|
-#define LUA_COMPAT_LSTR 1
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
|
|
|
-** CHANGE it to undefined as soon as you rename 'string.gfind' to
|
|
|
-** 'string.gmatch'.
|
|
|
-*/
|
|
|
-#define LUA_COMPAT_GFIND
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
|
|
|
-@* behavior.
|
|
|
-** CHANGE it to undefined as soon as you replace to 'luaL_register'
|
|
|
-** your uses of 'luaL_openlib'
|
|
|
-*/
|
|
|
-#define LUA_COMPAT_OPENLIB
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ luai_apicheck is the assert macro used by the Lua-C API.
|
|
|
-** CHANGE luai_apicheck if you want Lua to perform some checks in the
|
|
|
-** parameters it gets from API calls. This may slow down the interpreter
|
|
|
-** a bit, but may be quite useful when debugging C code that interfaces
|
|
|
-** with Lua. A useful redefinition is to use assert.h.
|
|
|
-*/
|
|
|
-#if defined(LUA_USE_APICHECK)
|
|
|
-#include <assert.h>
|
|
|
-#define luai_apicheck(L,o) { (void)L; assert(o); }
|
|
|
-#else
|
|
|
-#define luai_apicheck(L,o) { (void)L; }
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_BITSINT defines the number of bits in an int.
|
|
|
-** CHANGE here if Lua cannot automatically detect the number of bits of
|
|
|
-** your machine. Probably you do not need to change this.
|
|
|
-*/
|
|
|
-/* avoid overflows in comparison */
|
|
|
-#if INT_MAX-20 < 32760
|
|
|
-#define LUAI_BITSINT 16
|
|
|
-#elif INT_MAX > 2147483640L
|
|
|
-/* int has at least 32 bits */
|
|
|
-#define LUAI_BITSINT 32
|
|
|
-#else
|
|
|
-#error "you must define LUA_BITSINT with number of bits in an integer"
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
|
|
|
-@@ LUAI_INT32 is an signed integer with at least 32 bits.
|
|
|
-@@ LUAI_UMEM is an unsigned integer big enough to count the total
|
|
|
-@* memory used by Lua.
|
|
|
-@@ LUAI_MEM is a signed integer big enough to count the total memory
|
|
|
-@* used by Lua.
|
|
|
-** CHANGE here if for some weird reason the default definitions are not
|
|
|
-** good enough for your machine. (The definitions in the 'else'
|
|
|
-** part always works, but may waste space on machines with 64-bit
|
|
|
-** longs.) Probably you do not need to change this.
|
|
|
-*/
|
|
|
-#if LUAI_BITSINT >= 32
|
|
|
-#define LUAI_UINT32 unsigned int
|
|
|
-#define LUAI_INT32 int
|
|
|
-#define LUAI_MAXINT32 INT_MAX
|
|
|
-#define LUAI_UMEM size_t
|
|
|
-#define LUAI_MEM ptrdiff_t
|
|
|
-#else
|
|
|
-/* 16-bit ints */
|
|
|
-#define LUAI_UINT32 unsigned long
|
|
|
-#define LUAI_INT32 long
|
|
|
-#define LUAI_MAXINT32 LONG_MAX
|
|
|
-#define LUAI_UMEM unsigned long
|
|
|
-#define LUAI_MEM long
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_MAXCALLS limits the number of nested calls.
|
|
|
-** CHANGE it if you need really deep recursive calls. This limit is
|
|
|
-** arbitrary; its only purpose is to stop infinite recursion before
|
|
|
-** exhausting memory.
|
|
|
-*/
|
|
|
-#define LUAI_MAXCALLS 20000
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_MAXCSTACK limits the number of Lua stack slots that a C function
|
|
|
-@* can use.
|
|
|
-** CHANGE it if you need lots of (Lua) stack space for your C
|
|
|
-** functions. This limit is arbitrary; its only purpose is to stop C
|
|
|
-** functions to consume unlimited stack space. (must be smaller than
|
|
|
-** -LUA_REGISTRYINDEX)
|
|
|
-*/
|
|
|
-#define LUAI_MAXCSTACK 8000
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-** {==================================================================
|
|
|
-** CHANGE (to smaller values) the following definitions if your system
|
|
|
-** has a small C stack. (Or you may want to change them to larger
|
|
|
-** values if your system has a large C stack and these limits are
|
|
|
-** too rigid for you.) Some of these constants control the size of
|
|
|
-** stack-allocated arrays used by the compiler or the interpreter, while
|
|
|
-** others limit the maximum number of recursive calls that the compiler
|
|
|
-** or the interpreter can perform. Values too large may cause a C stack
|
|
|
-** overflow for some forms of deep constructs.
|
|
|
-** ===================================================================
|
|
|
-*/
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_MAXCCALLS is the maximum depth for nested C calls (short) and
|
|
|
-@* syntactical nested non-terminals in a program.
|
|
|
-*/
|
|
|
-#define LUAI_MAXCCALLS 200
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_MAXVARS is the maximum number of local variables per function
|
|
|
-@* (must be smaller than 250).
|
|
|
-*/
|
|
|
-#define LUAI_MAXVARS 200
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_MAXUPVALUES is the maximum number of upvalues per function
|
|
|
-@* (must be smaller than 250).
|
|
|
-*/
|
|
|
-#define LUAI_MAXUPVALUES 60
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
|
|
-*/
|
|
|
-#define LUAL_BUFFERSIZE BUFSIZ
|
|
|
-
|
|
|
-/* }================================================================== */
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-** {==================================================================
|
|
|
-@@ LUA_NUMBER is the type of numbers in Lua.
|
|
|
-** CHANGE the following definitions only if you want to build Lua
|
|
|
-** with a number type different from double. You may also need to
|
|
|
-** change lua_number2int & lua_number2integer.
|
|
|
-** ===================================================================
|
|
|
-*/
|
|
|
-
|
|
|
-#define LUA_NUMBER_DOUBLE
|
|
|
-#define LUA_NUMBER double
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
|
|
|
-@* over a number.
|
|
|
-*/
|
|
|
-#define LUAI_UACNUMBER double
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_NUMBER_SCAN is the format for reading numbers.
|
|
|
-@@ LUA_NUMBER_FMT is the format for writing numbers.
|
|
|
-@@ lua_number2str converts a number to a string.
|
|
|
-@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
|
|
|
-@@ lua_str2number converts a string to a number.
|
|
|
-*/
|
|
|
-#define LUA_NUMBER_SCAN "%lf"
|
|
|
-#define LUA_NUMBER_FMT "%.14g"
|
|
|
-#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
|
|
|
-#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */
|
|
|
-#define lua_str2number(s,p) strtod((s), (p))
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ The luai_num* macros define the primitive operations over numbers.
|
|
|
-*/
|
|
|
-#if defined(LUA_CORE)
|
|
|
-#include <math.h>
|
|
|
-#define luai_numadd(a,b) ((a)+(b))
|
|
|
-#define luai_numsub(a,b) ((a)-(b))
|
|
|
-#define luai_nummul(a,b) ((a)*(b))
|
|
|
-#define luai_numdiv(a,b) ((a)/(b))
|
|
|
-#define luai_nummod(a,b) ((a) - floor((a)/(b))*(b))
|
|
|
-#define luai_numpow(a,b) (pow(a,b))
|
|
|
-#define luai_numunm(a) (-(a))
|
|
|
-#define luai_numeq(a,b) ((a)==(b))
|
|
|
-#define luai_numlt(a,b) ((a)<(b))
|
|
|
-#define luai_numle(a,b) ((a)<=(b))
|
|
|
-#define luai_numisnan(a) (!luai_numeq((a), (a)))
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ lua_number2int is a macro to convert lua_Number to int.
|
|
|
-@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
|
|
|
-** CHANGE them if you know a faster way to convert a lua_Number to
|
|
|
-** int (with any rounding method and without throwing errors) in your
|
|
|
-** system. In Pentium machines, a naive typecast from double to int
|
|
|
-** in C is extremely slow, so any alternative is worth trying.
|
|
|
-*/
|
|
|
-
|
|
|
-/* On a Pentium, resort to a trick */
|
|
|
-#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
|
|
|
- (defined(__i386) || defined (_M_IX86) || defined(__i386__))
|
|
|
-
|
|
|
-/* On a Microsoft compiler, use assembler */
|
|
|
-#if defined(_MSC_VER)
|
|
|
-
|
|
|
-#define lua_number2int(i,d) __asm fld d __asm fistp i
|
|
|
-#define lua_number2integer(i,n) lua_number2int(i, n)
|
|
|
-
|
|
|
-/* the next trick should work on any Pentium, but sometimes clashes
|
|
|
- with a DirectX idiosyncrasy */
|
|
|
-#else
|
|
|
-
|
|
|
-union luai_Cast { double l_d; long l_l; };
|
|
|
-#define lua_number2int(i,d) \
|
|
|
- { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
|
|
|
-#define lua_number2integer(i,n) lua_number2int(i, n)
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/* this option always works, but may be slow */
|
|
|
-#else
|
|
|
-#define lua_number2int(i,d) ((i)=(int)(d))
|
|
|
-#define lua_number2integer(i,d) ((i)=(lua_Integer)(d))
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-/* }================================================================== */
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
|
|
|
-** CHANGE it if your system requires alignments larger than double. (For
|
|
|
-** instance, if your system supports long doubles and they must be
|
|
|
-** aligned in 16-byte boundaries, then you should add long double in the
|
|
|
-** union.) Probably you do not need to change this.
|
|
|
-*/
|
|
|
-#define LUAI_USER_ALIGNMENT_T union { double u; void *s; long l; }
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_THROW/LUAI_TRY define how Lua does exception handling.
|
|
|
-** CHANGE them if you prefer to use longjmp/setjmp even with C++
|
|
|
-** or if want/don't to use _longjmp/_setjmp instead of regular
|
|
|
-** longjmp/setjmp. By default, Lua handles errors with exceptions when
|
|
|
-** compiling as C++ code, with _longjmp/_setjmp when asked to use them,
|
|
|
-** and with longjmp/setjmp otherwise.
|
|
|
-*/
|
|
|
-#if defined(__cplusplus)
|
|
|
-/* C++ exceptions */
|
|
|
-#define LUAI_THROW(L,c) throw(c)
|
|
|
-#define LUAI_TRY(L,c,a) try { a } catch(...) \
|
|
|
- { if ((c)->status == 0) (c)->status = -1; }
|
|
|
-#define luai_jmpbuf int /* dummy variable */
|
|
|
-
|
|
|
-#elif defined(LUA_USE_ULONGJMP)
|
|
|
-/* in Unix, try _longjmp/_setjmp (more efficient) */
|
|
|
-#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
|
|
|
-#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
|
|
|
-#define luai_jmpbuf jmp_buf
|
|
|
-
|
|
|
-#else
|
|
|
-/* default handling with long jumps */
|
|
|
-#define LUAI_THROW(L,c) longjmp((c)->b, 1)
|
|
|
-#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
|
|
|
-#define luai_jmpbuf jmp_buf
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_MAXCAPTURES is the maximum number of captures that a pattern
|
|
|
-@* can do during pattern-matching.
|
|
|
-** CHANGE it if you need more captures. This limit is arbitrary.
|
|
|
-*/
|
|
|
-#define LUA_MAXCAPTURES 32
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ lua_tmpnam is the function that the OS library uses to create a
|
|
|
-@* temporary name.
|
|
|
-@@ LUA_TMPNAMBUFSIZE is the maximum size of a name created by lua_tmpnam.
|
|
|
-** CHANGE them if you have an alternative to tmpnam (which is considered
|
|
|
-** insecure) or if you want the original tmpnam anyway. By default, Lua
|
|
|
-** uses tmpnam except when POSIX is available, where it uses mkstemp.
|
|
|
-*/
|
|
|
-#if defined(loslib_c) || defined(luaall_c)
|
|
|
-
|
|
|
-#if defined(LUA_USE_MKSTEMP)
|
|
|
-#include <unistd.h>
|
|
|
-#define LUA_TMPNAMBUFSIZE 32
|
|
|
-#define lua_tmpnam(b,e) { \
|
|
|
- strcpy(b, "/tmp/lua_XXXXXX"); \
|
|
|
- e = mkstemp(b); \
|
|
|
- if (e != -1) close(e); \
|
|
|
- e = (e == -1); }
|
|
|
-
|
|
|
-#else
|
|
|
-#define LUA_TMPNAMBUFSIZE L_tmpnam
|
|
|
-#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); }
|
|
|
-#endif
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ lua_popen spawns a new process connected to the current one through
|
|
|
-@* the file streams.
|
|
|
-** CHANGE it if you have a way to implement it in your system.
|
|
|
-*/
|
|
|
-#if defined(LUA_USE_POPEN)
|
|
|
-
|
|
|
-#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m))
|
|
|
-#define lua_pclose(L,file) ((void)L, (pclose(file) != -1))
|
|
|
-
|
|
|
-#elif defined(LUA_WIN)
|
|
|
-
|
|
|
-#define lua_popen(L,c,m) ((void)L, _popen(c,m))
|
|
|
-#define lua_pclose(L,file) ((void)L, (_pclose(file) != -1))
|
|
|
-
|
|
|
-#else
|
|
|
-
|
|
|
-#define lua_popen(L,c,m) ((void)((void)c, m), \
|
|
|
- luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
|
|
|
-#define lua_pclose(L,file) ((void)((void)L, file), 0)
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_DL_* define which dynamic-library system Lua should use.
|
|
|
-** CHANGE here if Lua has problems choosing the appropriate
|
|
|
-** dynamic-library system for your platform (either Windows' DLL, Mac's
|
|
|
-** dyld, or Unix's dlopen). If your system is some kind of Unix, there
|
|
|
-** is a good chance that it has dlopen, so LUA_DL_DLOPEN will work for
|
|
|
-** it. To use dlopen you also need to adapt the src/Makefile (probably
|
|
|
-** adding -ldl to the linker options), so Lua does not select it
|
|
|
-** automatically. (When you change the makefile to add -ldl, you must
|
|
|
-** also add -DLUA_USE_DLOPEN.)
|
|
|
-** If you do not want any kind of dynamic library, undefine all these
|
|
|
-** options.
|
|
|
-** By default, _WIN32 gets LUA_DL_DLL and MAC OS X gets LUA_DL_DYLD.
|
|
|
-*/
|
|
|
-#if defined(LUA_USE_DLOPEN)
|
|
|
-#define LUA_DL_DLOPEN
|
|
|
-#endif
|
|
|
-
|
|
|
-#if defined(LUA_WIN)
|
|
|
-#define LUA_DL_DLL
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUAI_EXTRASPACE allows you to add user-specific data in a lua_State
|
|
|
-@* (the data goes just *before* the lua_State pointer).
|
|
|
-** CHANGE (define) this if you really need that. This value must be
|
|
|
-** a multiple of the maximum alignment required for your machine.
|
|
|
-*/
|
|
|
-#define LUAI_EXTRASPACE 0
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ luai_userstate* allow user-specific actions on threads.
|
|
|
-** CHANGE them if you defined LUAI_EXTRASPACE and need to do something
|
|
|
-** extra when a thread is created/deleted/resumed/yielded.
|
|
|
-*/
|
|
|
-#define luai_userstateopen(L) ((void)L)
|
|
|
-#define luai_userstateclose(L) ((void)L)
|
|
|
-#define luai_userstatethread(L,L1) ((void)L)
|
|
|
-#define luai_userstatefree(L) ((void)L)
|
|
|
-#define luai_userstateresume(L,n) ((void)L)
|
|
|
-#define luai_userstateyield(L,n) ((void)L)
|
|
|
-
|
|
|
-
|
|
|
-/*
|
|
|
-@@ LUA_INTFRMLEN is the length modifier for integer conversions
|
|
|
-@* in 'string.format'.
|
|
|
-@@ LUA_INTFRM_T is the integer type correspoding to the previous length
|
|
|
-@* modifier.
|
|
|
-** CHANGE them if your system supports long long or does not support long.
|
|
|
-*/
|
|
|
-
|
|
|
-#if defined(LUA_USELONGLONG)
|
|
|
-
|
|
|
-#define LUA_INTFRMLEN "ll"
|
|
|
-#define LUA_INTFRM_T long long
|
|
|
-
|
|
|
-#else
|
|
|
-
|
|
|
-#define LUA_INTFRMLEN "l"
|
|
|
-#define LUA_INTFRM_T long
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-/* =================================================================== */
|
|
|
-
|
|
|
-/*
|
|
|
-** Local configuration. You can use this space to add your redefinitions
|
|
|
-** without modifying the main part of the file.
|
|
|
-*/
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
diff --git lua-5.1.4/src/luaconf.h.template.in lua-5.1.4-autotoolize/src/luaconf.h.template.in
|
|
|
new file mode 100644
|
|
|
index 0000000..595200c
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/src/luaconf.h.template.in
|
|
|
@@ -0,0 +1,754 @@
|
|
|
+/*
|
|
|
+** $Id: luaconf.h,v 1.81 2006/02/10 17:44:06 roberto Exp $
|
|
|
+** Configuration file for Lua
|
|
|
+** See Copyright Notice in lua.h
|
|
|
+*/
|
|
|
+
|
|
|
+
|
|
|
+#ifndef lconfig_h
|
|
|
+#define lconfig_h
|
|
|
+
|
|
|
+#include <limits.h>
|
|
|
+#include <stddef.h>
|
|
|
+
|
|
|
+/*
|
|
|
+** =================
|
|
|
+** Autotoolification
|
|
|
+** =================
|
|
|
+*/
|
|
|
+
|
|
|
+/** autotools-patch **/
|
|
|
+@POSIX_DEFS@
|
|
|
+@LUA_DL_DEFS@
|
|
|
+@LUA_BUILD_AS_DLL_DEFS@
|
|
|
+@READLINE_DEFS@
|
|
|
+/** autotools-patch **/
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+** ==================================================================
|
|
|
+** Search for "@@" to find all configurable definitions.
|
|
|
+** ===================================================================
|
|
|
+*/
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_ANSI controls the use of non-ansi features.
|
|
|
+** CHANGE it (define it) if you want Lua to avoid the use of any
|
|
|
+** non-ansi feature or library.
|
|
|
+*/
|
|
|
+#if defined(__STRICT_ANSI__)
|
|
|
+#define LUA_ANSI
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+#if !defined(LUA_ANSI) && defined(_WIN32)
|
|
|
+#define LUA_WIN
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_USE_POSIX includes all functionallity listed as X/Open System
|
|
|
+@* Interfaces Extension (XSI).
|
|
|
+** CHANGE it (define it) if your system is XSI compatible.
|
|
|
+*/
|
|
|
+#if defined(LUA_USE_POSIX)
|
|
|
+#define LUA_USE_MKSTEMP
|
|
|
+#define LUA_USE_ISATTY
|
|
|
+#define LUA_USE_POPEN
|
|
|
+#define LUA_USE_ULONGJMP
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_PATH and LUA_CPATH are the names of the environment variables that
|
|
|
+@* Lua check to set its paths.
|
|
|
+@@ LUA_INIT is the name of the environment variable that Lua
|
|
|
+@* checks for initialization code.
|
|
|
+** CHANGE them if you want different names.
|
|
|
+*/
|
|
|
+#define LUA_PATH "LUA_PATH"
|
|
|
+#define LUA_CPATH "LUA_CPATH"
|
|
|
+#define LUA_INIT "LUA_INIT"
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
|
|
|
+@* Lua libraries.
|
|
|
+@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
|
|
|
+@* C libraries.
|
|
|
+** CHANGE them if your machine has a non-conventional directory
|
|
|
+** hierarchy or if you want to install your libraries in
|
|
|
+** non-conventional directories.
|
|
|
+*/
|
|
|
+#if defined(_WIN32)
|
|
|
+/*
|
|
|
+** In Windows, any exclamation mark ('!') in the path is replaced by the
|
|
|
+** path of the directory of the executable file of the current process.
|
|
|
+*/
|
|
|
+#define LUA_LDIR "!\\lua\\"
|
|
|
+#define LUA_CDIR "!\\"
|
|
|
+#define LUA_PATH_DEFAULT \
|
|
|
+ ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
|
|
|
+ LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua"
|
|
|
+#define LUA_CPATH_DEFAULT \
|
|
|
+ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
|
|
|
+
|
|
|
+#else
|
|
|
+
|
|
|
+/** autotools-patch **/
|
|
|
+#define LUA_LDIR "%lua_datadir%/lua/5.1/"
|
|
|
+#if defined __alpha__ || defined __ia64__ || defined __powerpc64__ || \
|
|
|
+ defined __s390x__ || defined __sparc64__ || defined __x86_64__
|
|
|
+#define LUA_CDIR "/usr/lib64/lua/5.1/"
|
|
|
+#else
|
|
|
+#define LUA_CDIR "/usr/lib/lua/5.1/"
|
|
|
+#endif
|
|
|
+/** autotools-patch **/
|
|
|
+
|
|
|
+#define LUA_PATH_DEFAULT \
|
|
|
+ "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
|
|
|
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
|
|
|
+#define LUA_CPATH_DEFAULT \
|
|
|
+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_DIRSEP is the directory separator (for submodules).
|
|
|
+** CHANGE it if your machine does not use "/" as the directory separator
|
|
|
+** and is not Windows. (On Windows Lua automatically uses "\".)
|
|
|
+*/
|
|
|
+#if defined(_WIN32)
|
|
|
+#define LUA_DIRSEP "\\"
|
|
|
+#else
|
|
|
+#define LUA_DIRSEP "/"
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_PATHSEP is the character that separates templates in a path.
|
|
|
+@@ LUA_PATH_MARK is the string that marks the substitution points in a
|
|
|
+@* template.
|
|
|
+@@ LUA_EXECDIR in a Windows path is replaced by the executable's
|
|
|
+@* directory.
|
|
|
+@@ LUA_IGMARK is a mark to ignore all before it when bulding the
|
|
|
+@* luaopen_ function name.
|
|
|
+** CHANGE them if for some reason your system cannot use those
|
|
|
+** characters. (E.g., if one of those characters is a common character
|
|
|
+** in file/directory names.) Probably you do not need to change them.
|
|
|
+*/
|
|
|
+#define LUA_PATHSEP ";"
|
|
|
+#define LUA_PATH_MARK "?"
|
|
|
+#define LUA_EXECDIR "!"
|
|
|
+#define LUA_IGMARK "-"
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
|
|
|
+** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
|
|
|
+** machines, ptrdiff_t gives a good choice between int or long.)
|
|
|
+*/
|
|
|
+#define LUA_INTEGER ptrdiff_t
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_API is a mark for all core API functions.
|
|
|
+@@ LUALIB_API is a mark for all standard library functions.
|
|
|
+** CHANGE them if you need to define those functions in some special way.
|
|
|
+** For instance, if you want to create one Windows DLL with the core and
|
|
|
+** the libraries, you may want to use the following definition (define
|
|
|
+** LUA_BUILD_AS_DLL to get it).
|
|
|
+*/
|
|
|
+#if defined(LUA_BUILD_AS_DLL)
|
|
|
+
|
|
|
+#if defined(LUA_CORE) || defined(LUA_LIB)
|
|
|
+#define LUA_API __declspec(dllexport)
|
|
|
+#else
|
|
|
+#define LUA_API __declspec(dllimport)
|
|
|
+#endif
|
|
|
+
|
|
|
+#else
|
|
|
+
|
|
|
+#define LUA_API extern
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+/* more often than not the libs go together with the core */
|
|
|
+#define LUALIB_API LUA_API
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_FUNC is a mark for all extern functions that are not to be
|
|
|
+@* exported to outside modules.
|
|
|
+@@ LUAI_DATA is a mark for all extern (const) variables that are not to
|
|
|
+@* be exported to outside modules.
|
|
|
+** CHANGE them if you need to mark them in some special way. Elf/gcc
|
|
|
+** (versions 3.2 and later) mark them as "hidden" to optimize access
|
|
|
+** when Lua is compiled as a shared library.
|
|
|
+*/
|
|
|
+#if defined(luaall_c)
|
|
|
+#define LUAI_FUNC static
|
|
|
+#define LUAI_DATA /* empty */
|
|
|
+
|
|
|
+#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
|
|
|
+ defined(__ELF__)
|
|
|
+#define LUAI_FUNC __attribute__((visibility("hidden"))) extern
|
|
|
+#define LUAI_DATA LUAI_FUNC
|
|
|
+
|
|
|
+#else
|
|
|
+#define LUAI_FUNC extern
|
|
|
+#define LUAI_DATA extern
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_QL describes how error messages quote program elements.
|
|
|
+** CHANGE it if you want a different appearance.
|
|
|
+*/
|
|
|
+#define LUA_QL(x) "'" x "'"
|
|
|
+#define LUA_QS LUA_QL("%s")
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_IDSIZE gives the maximum size for the description of the source
|
|
|
+@* of a function in debug information.
|
|
|
+** CHANGE it if you want a different size.
|
|
|
+*/
|
|
|
+#define LUA_IDSIZE 60
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+** {==================================================================
|
|
|
+** Stand-alone configuration
|
|
|
+** ===================================================================
|
|
|
+*/
|
|
|
+
|
|
|
+#if defined(lua_c) || defined(luaall_c)
|
|
|
+
|
|
|
+/*
|
|
|
+@@ lua_stdin_is_tty detects whether the standard input is a 'tty' (that
|
|
|
+@* is, whether we're running lua interactively).
|
|
|
+** CHANGE it if you have a better definition for non-POSIX/non-Windows
|
|
|
+** systems.
|
|
|
+*/
|
|
|
+#if defined(LUA_USE_ISATTY)
|
|
|
+#include <unistd.h>
|
|
|
+#define lua_stdin_is_tty() isatty(0)
|
|
|
+#elif defined(LUA_WIN)
|
|
|
+#include <io.h>
|
|
|
+#include <stdio.h>
|
|
|
+#define lua_stdin_is_tty() _isatty(_fileno(stdin))
|
|
|
+#else
|
|
|
+#define lua_stdin_is_tty() 1 /* assume stdin is a tty */
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_PROMPT is the default prompt used by stand-alone Lua.
|
|
|
+@@ LUA_PROMPT2 is the default continuation prompt used by stand-alone Lua.
|
|
|
+** CHANGE them if you want different prompts. (You can also change the
|
|
|
+** prompts dynamically, assigning to globals _PROMPT/_PROMPT2.)
|
|
|
+*/
|
|
|
+#define LUA_PROMPT "> "
|
|
|
+#define LUA_PROMPT2 ">> "
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_PROGNAME is the default name for the stand-alone Lua program.
|
|
|
+** CHANGE it if your stand-alone interpreter has a different name and
|
|
|
+** your system is not able to detect that name automatically.
|
|
|
+*/
|
|
|
+#define LUA_PROGNAME "lua"
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_MAXINPUT is the maximum length for an input line in the
|
|
|
+@* stand-alone interpreter.
|
|
|
+** CHANGE it if you need longer lines.
|
|
|
+*/
|
|
|
+#define LUA_MAXINPUT 512
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ lua_readline defines how to show a prompt and then read a line from
|
|
|
+@* the standard input.
|
|
|
+@@ lua_saveline defines how to "save" a read line in a "history".
|
|
|
+@@ lua_freeline defines how to free a line read by lua_readline.
|
|
|
+** CHANGE them if you want to improve this functionality (e.g., by using
|
|
|
+** GNU readline and history facilities).
|
|
|
+*/
|
|
|
+#if defined(LUA_USE_READLINE)
|
|
|
+#include <stdio.h>
|
|
|
+#include <readline/readline.h>
|
|
|
+#include <readline/history.h>
|
|
|
+#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
|
|
|
+#define lua_saveline(L,idx) \
|
|
|
+ if (lua_strlen(L,idx) > 0) /* non-empty line? */ \
|
|
|
+ add_history(lua_tostring(L, idx)); /* add it to history */
|
|
|
+#define lua_freeline(L,b) ((void)L, free(b))
|
|
|
+#else
|
|
|
+#define lua_readline(L,b,p) \
|
|
|
+ ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
|
|
|
+ fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */
|
|
|
+#define lua_saveline(L,idx) { (void)L; (void)idx; }
|
|
|
+#define lua_freeline(L,b) { (void)L; (void)b; }
|
|
|
+#endif
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+/* }================================================================== */
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_GCPAUSE defines the default pause between garbage-collector cycles
|
|
|
+@* as a percentage.
|
|
|
+** CHANGE it if you want the GC to run faster or slower (higher values
|
|
|
+** mean larger pauses which mean slower collection.) You can also change
|
|
|
+** this value dynamically.
|
|
|
+*/
|
|
|
+#define LUAI_GCPAUSE 200 /* 200% (wait memory to double before next GC) */
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_GCMUL defines the default speed of garbage collection relative to
|
|
|
+@* memory allocation as a percentage.
|
|
|
+** CHANGE it if you want to change the granularity of the garbage
|
|
|
+** collection. (Higher values mean coarser collections. 0 represents
|
|
|
+** infinity, where each step performs a full collection.) You can also
|
|
|
+** change this value dynamically.
|
|
|
+*/
|
|
|
+#define LUAI_GCMUL 200 /* GC runs 'twice the speed' of memory allocation */
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_GETN controls compatibility with old getn behavior.
|
|
|
+** CHANGE it (define it) if you want exact compatibility with the
|
|
|
+** behavior of setn/getn in Lua 5.0.
|
|
|
+*/
|
|
|
+#undef LUA_COMPAT_GETN
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_LOADLIB controls compatibility about global loadlib.
|
|
|
+** CHANGE it to undefined as soon as you do not need a global 'loadlib'
|
|
|
+** function (the function is still available as 'package.loadlib').
|
|
|
+*/
|
|
|
+#undef LUA_COMPAT_LOADLIB
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_VARARG controls compatibility with old vararg feature.
|
|
|
+** CHANGE it to undefined as soon as your programs use only '...' to
|
|
|
+** access vararg parameters (instead of the old 'arg' table).
|
|
|
+*/
|
|
|
+#define LUA_COMPAT_VARARG
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
|
|
|
+** CHANGE it to undefined as soon as your programs use 'math.fmod' or
|
|
|
+** the new '%' operator instead of 'math.mod'.
|
|
|
+*/
|
|
|
+#define LUA_COMPAT_MOD
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
|
|
|
+@* facility.
|
|
|
+** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
|
|
|
+** off the advisory error when nesting [[...]].
|
|
|
+*/
|
|
|
+#define LUA_COMPAT_LSTR 1
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
|
|
|
+** CHANGE it to undefined as soon as you rename 'string.gfind' to
|
|
|
+** 'string.gmatch'.
|
|
|
+*/
|
|
|
+#define LUA_COMPAT_GFIND
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
|
|
|
+@* behavior.
|
|
|
+** CHANGE it to undefined as soon as you replace to 'luaL_registry'
|
|
|
+** your uses of 'luaL_openlib'
|
|
|
+*/
|
|
|
+#define LUA_COMPAT_OPENLIB
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ luai_apicheck is the assert macro used by the Lua-C API.
|
|
|
+** CHANGE luai_apicheck if you want Lua to perform some checks in the
|
|
|
+** parameters it gets from API calls. This may slow down the interpreter
|
|
|
+** a bit, but may be quite useful when debugging C code that interfaces
|
|
|
+** with Lua. A useful redefinition is to use assert.h.
|
|
|
+*/
|
|
|
+#if defined(LUA_USE_APICHECK)
|
|
|
+#include <assert.h>
|
|
|
+#define luai_apicheck(L,o) { (void)L; assert(o); }
|
|
|
+#else
|
|
|
+#define luai_apicheck(L,o) { (void)L; }
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_BITSINT defines the number of bits in an int.
|
|
|
+** CHANGE here if Lua cannot automatically detect the number of bits of
|
|
|
+** your machine. Probably you do not need to change this.
|
|
|
+*/
|
|
|
+/* avoid overflows in comparison */
|
|
|
+#if INT_MAX-20 < 32760
|
|
|
+#define LUAI_BITSINT 16
|
|
|
+#elif INT_MAX > 2147483640L
|
|
|
+/* int has at least 32 bits */
|
|
|
+#define LUAI_BITSINT 32
|
|
|
+#else
|
|
|
+#error "you must define LUA_BITSINT with number of bits in an integer"
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
|
|
|
+@@ LUAI_INT32 is an signed integer with at least 32 bits.
|
|
|
+@@ LUAI_UMEM is an unsigned integer big enough to count the total
|
|
|
+@* memory used by Lua.
|
|
|
+@@ LUAI_MEM is a signed integer big enough to count the total memory
|
|
|
+@* used by Lua.
|
|
|
+** CHANGE here if for some weird reason the default definitions are not
|
|
|
+** good enough for your machine. (The definitions in the 'else'
|
|
|
+** part always works, but may waste space on machines with 64-bit
|
|
|
+** longs.) Probably you do not need to change this.
|
|
|
+*/
|
|
|
+#if LUAI_BITSINT >= 32
|
|
|
+#define LUAI_UINT32 unsigned int
|
|
|
+#define LUAI_INT32 int
|
|
|
+#define LUAI_MAXINT32 INT_MAX
|
|
|
+#define LUAI_UMEM size_t
|
|
|
+#define LUAI_MEM ptrdiff_t
|
|
|
+#else
|
|
|
+/* 16-bit ints */
|
|
|
+#define LUAI_UINT32 unsigned long
|
|
|
+#define LUAI_INT32 long
|
|
|
+#define LUAI_MAXINT32 LONG_MAX
|
|
|
+#define LUAI_UMEM unsigned long
|
|
|
+#define LUAI_MEM long
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_MAXCALLS limits the number of nested calls.
|
|
|
+** CHANGE it if you need really deep recursive calls. This limit is
|
|
|
+** arbitrary; its only purpose is to stop infinite recursion before
|
|
|
+** exhausting memory.
|
|
|
+*/
|
|
|
+#define LUAI_MAXCALLS 20000
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_MAXCSTACK limits the number of Lua stack slots that a C function
|
|
|
+@* can use.
|
|
|
+** CHANGE it if you need lots of (Lua) stack space for your C
|
|
|
+** functions. This limit is arbitrary; its only purpose is to stop C
|
|
|
+** functions to consume unlimited stack space.
|
|
|
+*/
|
|
|
+#define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER))))
|
|
|
+#define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX)
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+** {==================================================================
|
|
|
+** CHANGE (to smaller values) the following definitions if your system
|
|
|
+** has a small C stack. (Or you may want to change them to larger
|
|
|
+** values if your system has a large C stack and these limits are
|
|
|
+** too rigid for you.) Some of these constants control the size of
|
|
|
+** stack-allocated arrays used by the compiler or the interpreter, while
|
|
|
+** others limit the maximum number of recursive calls that the compiler
|
|
|
+** or the interpreter can perform. Values too large may cause a C stack
|
|
|
+** overflow for some forms of deep constructs.
|
|
|
+** ===================================================================
|
|
|
+*/
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_MAXCCALLS is the maximum depth for nested C calls (short) and
|
|
|
+@* syntactical nested non-terminals in a program.
|
|
|
+*/
|
|
|
+#define LUAI_MAXCCALLS 200
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_MAXVARS is the maximum number of local variables per function
|
|
|
+@* (must be smaller than 250).
|
|
|
+*/
|
|
|
+#define LUAI_MAXVARS 200
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_MAXUPVALUES is the maximum number of upvalues per function
|
|
|
+@* (must be smaller than 250).
|
|
|
+*/
|
|
|
+#define LUAI_MAXUPVALUES 60
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
|
|
+*/
|
|
|
+#define LUAL_BUFFERSIZE BUFSIZ
|
|
|
+
|
|
|
+/* }================================================================== */
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+** {==================================================================
|
|
|
+@@ LUA_NUMBER is the type of numbers in Lua.
|
|
|
+** CHANGE the following definitions only if you want to build Lua
|
|
|
+** with a number type different from double. You may also need to
|
|
|
+** change lua_number2int & lua_number2integer.
|
|
|
+** ===================================================================
|
|
|
+*/
|
|
|
+
|
|
|
+#define LUA_NUMBER_DOUBLE
|
|
|
+#define LUA_NUMBER double
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
|
|
|
+@* over a number.
|
|
|
+*/
|
|
|
+#define LUAI_UACNUMBER double
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_NUMBER_SCAN is the format for reading numbers.
|
|
|
+@@ LUA_NUMBER_FMT is the format for writing numbers.
|
|
|
+@@ lua_number2str converts a number to a string.
|
|
|
+@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
|
|
|
+@@ lua_str2number converts a string to a number.
|
|
|
+*/
|
|
|
+#define LUA_NUMBER_SCAN "%lf"
|
|
|
+#define LUA_NUMBER_FMT "%.14g"
|
|
|
+#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
|
|
|
+#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */
|
|
|
+#define lua_str2number(s,p) strtod((s), (p))
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ The luai_num* macros define the primitive operations over numbers.
|
|
|
+*/
|
|
|
+#if defined(LUA_CORE)
|
|
|
+#include <math.h>
|
|
|
+#define luai_numadd(a,b) ((a)+(b))
|
|
|
+#define luai_numsub(a,b) ((a)-(b))
|
|
|
+#define luai_nummul(a,b) ((a)*(b))
|
|
|
+#define luai_numdiv(a,b) ((a)/(b))
|
|
|
+#define luai_nummod(a,b) ((a) - floor((a)/(b))*(b))
|
|
|
+#define luai_numpow(a,b) (pow(a,b))
|
|
|
+#define luai_numunm(a) (-(a))
|
|
|
+#define luai_numeq(a,b) ((a)==(b))
|
|
|
+#define luai_numlt(a,b) ((a)<(b))
|
|
|
+#define luai_numle(a,b) ((a)<=(b))
|
|
|
+#define luai_numisnan(a) (!luai_numeq((a), (a)))
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ lua_number2int is a macro to convert lua_Number to int.
|
|
|
+@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
|
|
|
+** CHANGE them if you know a faster way to convert a lua_Number to
|
|
|
+** int (with any rounding method and without throwing errors) in your
|
|
|
+** system. In Pentium machines, a naive typecast from double to int
|
|
|
+** in C is extremely slow, so any alternative is worth trying.
|
|
|
+*/
|
|
|
+
|
|
|
+/* On a Pentium, resort to a trick */
|
|
|
+#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
|
|
|
+ (defined(__i386) || defined (_M_IX86) || defined(__i386__))
|
|
|
+union luai_Cast { double l_d; long l_l; };
|
|
|
+#define lua_number2int(i,d) \
|
|
|
+ { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
|
|
|
+#define lua_number2integer(i,n) lua_number2int(i, n)
|
|
|
+
|
|
|
+/* this option always works, but may be slow */
|
|
|
+#else
|
|
|
+#define lua_number2int(i,d) ((i)=(int)(d))
|
|
|
+#define lua_number2integer(i,d) ((i)=(lua_Integer)(d))
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+/* }================================================================== */
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
|
|
|
+** CHANGE it if your system requires alignments larger than double. (For
|
|
|
+** instance, if your system supports long doubles and they must be
|
|
|
+** aligned in 16-byte boundaries, then you should add long double in the
|
|
|
+** union.) Probably you do not need to change this.
|
|
|
+*/
|
|
|
+#define LUAI_USER_ALIGNMENT_T union { double u; void *s; long l; }
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_THROW/LUAI_TRY define how Lua does exception handling.
|
|
|
+** CHANGE them if you prefer to use longjmp/setjmp even with C++
|
|
|
+** or if want/don't to use _longjmp/_setjmp instead of regular
|
|
|
+** longjmp/setjmp. By default, Lua handles errors with exceptions when
|
|
|
+** compiling as C++ code, with _longjmp/_setjmp when asked to use them,
|
|
|
+** and with longjmp/setjmp otherwise.
|
|
|
+*/
|
|
|
+#if defined(__cplusplus)
|
|
|
+/* C++ exceptions */
|
|
|
+#define LUAI_THROW(L,c) throw(c)
|
|
|
+#define LUAI_TRY(L,c,a) try { a } catch(...) \
|
|
|
+ { if ((c)->status == 0) (c)->status = -1; }
|
|
|
+#define luai_jmpbuf int /* dummy variable */
|
|
|
+
|
|
|
+#elif defined(LUA_USE_ULONGJMP)
|
|
|
+/* in Unix, try _longjmp/_setjmp (more efficient) */
|
|
|
+#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
|
|
|
+#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
|
|
|
+#define luai_jmpbuf jmp_buf
|
|
|
+
|
|
|
+#else
|
|
|
+/* default handling with long jumps */
|
|
|
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
|
|
|
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
|
|
|
+#define luai_jmpbuf jmp_buf
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_MAXCAPTURES is the maximum number of captures that a pattern
|
|
|
+@* can do during pattern-matching.
|
|
|
+** CHANGE it if you need more captures. This limit is arbitrary.
|
|
|
+*/
|
|
|
+#define LUA_MAXCAPTURES 32
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ lua_tmpnam is the function that the OS library uses to create a
|
|
|
+@* temporary name.
|
|
|
+@@ LUA_TMPNAMBUFSIZE is the maximum size of a name created by lua_tmpnam.
|
|
|
+** CHANGE them if you have an alternative to tmpnam (which is considered
|
|
|
+** insecure) or if you want the original tmpnam anyway. By default, Lua
|
|
|
+** uses tmpnam except when POSIX is available, where it uses mkstemp.
|
|
|
+*/
|
|
|
+#if defined(loslib_c) || defined(luaall_c)
|
|
|
+
|
|
|
+#if defined(LUA_USE_MKSTEMP)
|
|
|
+#include <unistd.h>
|
|
|
+#define LUA_TMPNAMBUFSIZE 32
|
|
|
+#define lua_tmpnam(b,e) { \
|
|
|
+ strcpy(b, "/tmp/lua_XXXXXX"); \
|
|
|
+ e = mkstemp(b); \
|
|
|
+ if (e != -1) close(e); \
|
|
|
+ e = (e == -1); }
|
|
|
+
|
|
|
+#else
|
|
|
+#define LUA_TMPNAMBUFSIZE L_tmpnam
|
|
|
+#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); }
|
|
|
+#endif
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ lua_popen spawns a new process connected to the current one through
|
|
|
+@* the file streams.
|
|
|
+** CHANGE it if you have a way to implement it in your system.
|
|
|
+*/
|
|
|
+#if defined(LUA_USE_POPEN)
|
|
|
+
|
|
|
+#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m))
|
|
|
+#define lua_pclose(L,file) ((void)L, (pclose(file) != -1))
|
|
|
+
|
|
|
+#elif defined(LUA_WIN)
|
|
|
+
|
|
|
+#define lua_popen(L,c,m) ((void)L, _popen(c,m))
|
|
|
+#define lua_pclose(L,file) ((void)L, (_pclose(file) != -1))
|
|
|
+
|
|
|
+#else
|
|
|
+
|
|
|
+#define lua_popen(L,c,m) ((void)((void)c, m), \
|
|
|
+ luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
|
|
|
+#define lua_pclose(L,file) ((void)((void)L, file), 0)
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_DL_* define which dynamic-library system Lua should use.
|
|
|
+** CHANGE here if Lua has problems choosing the appropriate
|
|
|
+** dynamic-library system for your platform (either Windows' DLL, Mac's
|
|
|
+** dyld, or Unix's dlopen). If your system is some kind of Unix, there
|
|
|
+** is a good chance that it has dlopen, so LUA_DL_DLOPEN will work for
|
|
|
+** it. To use dlopen you also need to adapt the src/Makefile (probably
|
|
|
+** adding -ldl to the linker options), so Lua does not select it
|
|
|
+** automatically. (When you change the makefile to add -ldl, you must
|
|
|
+** also add -DLUA_USE_DLOPEN.)
|
|
|
+** If you do not want any kind of dynamic library, undefine all these
|
|
|
+** options.
|
|
|
+** By default, _WIN32 gets LUA_DL_DLL and MAC OS X gets LUA_DL_DYLD.
|
|
|
+*/
|
|
|
+#if defined(LUA_WIN)
|
|
|
+#define LUA_DL_DLL
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUAI_EXTRASPACE allows you to add user-specific data in a lua_State
|
|
|
+@* (the data goes just *before* the lua_State pointer).
|
|
|
+** CHANGE (define) this if you really need that. This value must be
|
|
|
+** a multiple of the maximum alignment required for your machine.
|
|
|
+*/
|
|
|
+#define LUAI_EXTRASPACE 0
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ luai_userstate* allow user-specific actions on threads.
|
|
|
+** CHANGE them if you defined LUAI_EXTRASPACE and need to do something
|
|
|
+** extra when a thread is created/deleted/resumed/yielded.
|
|
|
+*/
|
|
|
+#define luai_userstateopen(L) ((void)L)
|
|
|
+#define luai_userstateclose(L) ((void)L)
|
|
|
+#define luai_userstatethread(L,L1) ((void)L)
|
|
|
+#define luai_userstatefree(L) ((void)L)
|
|
|
+#define luai_userstateresume(L,n) ((void)L)
|
|
|
+#define luai_userstateyield(L,n) ((void)L)
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+@@ LUA_INTFRMLEN is the length modifier for integer conversions
|
|
|
+@* in 'string.format'.
|
|
|
+@@ LUA_INTFRM_T is the integer type correspoding to the previous length
|
|
|
+@* modifier.
|
|
|
+** CHANGE them if your system supports long long or does not support long.
|
|
|
+*/
|
|
|
+
|
|
|
+#if defined(LUA_USELONGLONG)
|
|
|
+
|
|
|
+#define LUA_INTFRMLEN "ll"
|
|
|
+#define LUA_INTFRM_T long long
|
|
|
+
|
|
|
+#else
|
|
|
+
|
|
|
+#define LUA_INTFRMLEN "l"
|
|
|
+#define LUA_INTFRM_T long
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/* =================================================================== */
|
|
|
+
|
|
|
+/*
|
|
|
+** Local configuration. You can use this space to add your redefinitions
|
|
|
+** without modifying the main part of the file.
|
|
|
+*/
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
diff --git lua-5.1.4/test/Makefile.am lua-5.1.4-autotoolize/test/Makefile.am
|
|
|
new file mode 100644
|
|
|
index 0000000..bab7eac
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/test/Makefile.am
|
|
|
@@ -0,0 +1,5 @@
|
|
|
+EXTRA_DIST = \
|
|
|
+ bisect.lua env.lua fib.lua life.lua printf.lua \
|
|
|
+ sieve.lua trace-calls.lua cf.lua factorial.lua globals.lua \
|
|
|
+ luac.lua README sort.lua trace-globals.lua echo.lua \
|
|
|
+ fibfor.lua hello.lua readonly.lua table.lua xd.lua
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From 52ba6d11a1c3e85ad152f2e833c1ff2d1d0e9e5e Mon Sep 17 00:00:00 2001
|
|
|
From: Petri Lehtinen <petri@digip.org>
|
|
|
Date: Thu, 6 Jan 2011 21:11:47 +0200
|
|
|
Subject: [PATCH 02/11] Use $(builldir) instead of $(srcdir) when referencing luaconf.h.template
|
|
|
|
|
|
This file is generated from luaconf.h.template.in so it is in
|
|
|
$(builddir), which is not the same as $(srcdir) when building out of
|
|
|
tree.
|
|
|
|
|
|
Fixes GH-1.
|
|
|
---
|
|
|
src/Makefile.am | 4 ++--
|
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/src/Makefile.am lua-5.1.4-autotoolize/src/Makefile.am
|
|
|
index 6fbf296..5bcad35 100644
|
|
|
--- lua-5.1.4/src/Makefile.am
|
|
|
+++ lua-5.1.4-autotoolize/src/Makefile.am
|
|
|
@@ -39,7 +39,7 @@ edit = sed \
|
|
|
-e 's,%lua_datadir%,$(datadir),g' \
|
|
|
-e 's,%lua_libdir%,$(libdir),g'
|
|
|
|
|
|
-luaconf.h : $(srcdir)/luaconf.h.template
|
|
|
+luaconf.h : $(builddir)/luaconf.h.template
|
|
|
rm -f luaconf.h luaconf.h.tmp
|
|
|
- $(edit) $(srcdir)/luaconf.h.template > luaconf.h.tmp
|
|
|
+ $(edit) $(builddir)/luaconf.h.template > luaconf.h.tmp
|
|
|
mv luaconf.h.tmp luaconf.h
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From eed2ae9864b785d60a6a54d7731d458336a5d4e1 Mon Sep 17 00:00:00 2001
|
|
|
From: Petri Lehtinen <petri@digip.org>
|
|
|
Date: Fri, 7 Jan 2011 08:58:41 +0200
|
|
|
Subject: [PATCH 03/11] Fix version numbers to 5.1.4, change pkgname to autotoolized-lua
|
|
|
|
|
|
---
|
|
|
configure.ac | 2 +-
|
|
|
etc/lua.pc.in | 2 +-
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/configure.ac lua-5.1.4-autotoolize/configure.ac
|
|
|
index a33b0b6..9690c49 100644
|
|
|
--- lua-5.1.4/configure.ac
|
|
|
+++ lua-5.1.4-autotoolize/configure.ac
|
|
|
@@ -1,5 +1,5 @@
|
|
|
AC_PREREQ(2.59)
|
|
|
-AC_INIT([Autotoolized Lua], [5.1.3], [], [lua-at])
|
|
|
+AC_INIT([Autotoolized Lua], [5.1.4], [], [autotolized-lua])
|
|
|
|
|
|
AC_CONFIG_HEADERS([config.h])
|
|
|
AC_CONFIG_SRCDIR([src/lapi.c])
|
|
|
diff --git lua-5.1.4/etc/lua.pc.in lua-5.1.4-autotoolize/etc/lua.pc.in
|
|
|
index f6f0909..2c4ef36 100644
|
|
|
--- lua-5.1.4/etc/lua.pc.in
|
|
|
+++ lua-5.1.4-autotoolize/etc/lua.pc.in
|
|
|
@@ -1,5 +1,5 @@
|
|
|
V= 5.1
|
|
|
-R= 5.1.3
|
|
|
+R= 5.1.4
|
|
|
prefix= @prefix@
|
|
|
exec_prefix=${prefix}
|
|
|
libdir= @libdir@
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From 52de8b940e13efcd4af39d2aa49c03e1866fa59f Mon Sep 17 00:00:00 2001
|
|
|
From: Petri Lehtinen <petri@digip.org>
|
|
|
Date: Fri, 7 Jan 2011 09:12:12 +0200
|
|
|
Subject: [PATCH 04/11] Run tests with make check
|
|
|
|
|
|
---
|
|
|
test/Makefile.am | 33 ++++++++++++++++++++++++++++-----
|
|
|
1 files changed, 28 insertions(+), 5 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/test/Makefile.am lua-5.1.4-autotoolize/test/Makefile.am
|
|
|
index bab7eac..4e911f8 100644
|
|
|
--- lua-5.1.4/test/Makefile.am
|
|
|
+++ lua-5.1.4-autotoolize/test/Makefile.am
|
|
|
@@ -1,5 +1,28 @@
|
|
|
-EXTRA_DIST = \
|
|
|
- bisect.lua env.lua fib.lua life.lua printf.lua \
|
|
|
- sieve.lua trace-calls.lua cf.lua factorial.lua globals.lua \
|
|
|
- luac.lua README sort.lua trace-globals.lua echo.lua \
|
|
|
- fibfor.lua hello.lua readonly.lua table.lua xd.lua
|
|
|
+ACTIVE_TESTS = \
|
|
|
+ bisect.lua \
|
|
|
+ cf.lua \
|
|
|
+ echo.lua \
|
|
|
+ env.lua \
|
|
|
+ factorial.lua \
|
|
|
+ fib.lua \
|
|
|
+ fibfor.lua \
|
|
|
+ hello.lua \
|
|
|
+ life.lua \
|
|
|
+ printf.lua \
|
|
|
+ sieve.lua \
|
|
|
+ sort.lua \
|
|
|
+ trace-calls.lua \
|
|
|
+ trace-globals.lua
|
|
|
+
|
|
|
+# Tests that fail on purpose or expect user input
|
|
|
+INACTIVE_TESTS = \
|
|
|
+ globals.lua \
|
|
|
+ luac.lua \
|
|
|
+ readonly.lua \
|
|
|
+ table.lua \
|
|
|
+ xd.lua
|
|
|
+
|
|
|
+TESTS = $(ACTIVE_TESTS)
|
|
|
+TESTS_ENVIRONMENT = $(srcdir)/run-test.sh $(top_builddir)/src/lua
|
|
|
+
|
|
|
+EXTRA_DIST = $(TESTS) README run-test.sh
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From e8014e2b86d292c389786d17ed47f95ec16d88e5 Mon Sep 17 00:00:00 2001
|
|
|
From: Petri Lehtinen <petri@digip.org>
|
|
|
Date: Fri, 7 Jan 2011 09:12:25 +0200
|
|
|
Subject: [PATCH 05/11] Don't try to distribute MANIFEST
|
|
|
|
|
|
It doesn't exist in the Lua source tree anymore.
|
|
|
---
|
|
|
Makefile.am | 2 +-
|
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/Makefile.am lua-5.1.4-autotoolize/Makefile.am
|
|
|
index e5b0801..b6021ad 100644
|
|
|
--- lua-5.1.4/Makefile.am
|
|
|
+++ lua-5.1.4-autotoolize/Makefile.am
|
|
|
@@ -1,3 +1,3 @@
|
|
|
SUBDIRS = src doc etc test
|
|
|
|
|
|
-EXTRA_DIST = autogen.sh COPYRIGHT HISTORY INSTALL MANIFEST README
|
|
|
+EXTRA_DIST = autogen.sh COPYRIGHT HISTORY INSTALL README
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From 878b8f863c74c3d41b136b94e1f8ff6457277110 Mon Sep 17 00:00:00 2001
|
|
|
From: Petri Lehtinen <petri@digip.org>
|
|
|
Date: Sat, 7 May 2011 20:22:00 +0300
|
|
|
Subject: [PATCH 06/11] Add missing test/run-test.sh
|
|
|
|
|
|
Fixes #2.
|
|
|
---
|
|
|
test/run-test.sh | 5 +++++
|
|
|
1 files changed, 5 insertions(+), 0 deletions(-)
|
|
|
create mode 100755 test/run-test.sh
|
|
|
|
|
|
diff --git lua-5.1.4/test/run-test.sh lua-5.1.4-autotoolize/test/run-test.sh
|
|
|
new file mode 100755
|
|
|
index 0000000..b93321e
|
|
|
--- /dev/null
|
|
|
+++ lua-5.1.4-autotoolize/test/run-test.sh
|
|
|
@@ -0,0 +1,5 @@
|
|
|
+#!/bin/sh
|
|
|
+
|
|
|
+echo "Running ${2#*/}..."
|
|
|
+
|
|
|
+exec $1 $2 >/dev/null
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From 50e3f03eb499fe3ae1803b940a853e73840c8fed Mon Sep 17 00:00:00 2001
|
|
|
From: Christian Wiese <chris@opensde.org>
|
|
|
Date: Tue, 21 Feb 2012 22:32:05 +0100
|
|
|
Subject: [PATCH 07/11] fix to not link liblua and luac against libreadline
|
|
|
|
|
|
There is no need to link liblua and luac against libreadline and friends.
|
|
|
It makes only sense to link the lua interpreter itself against readline
|
|
|
as it is the only one which can be run interactively.
|
|
|
|
|
|
Please note that by setting setting use_readline=yes as action-if-found
|
|
|
within the AC_CHECK_LIB macro, is a kind of workaround for not leaking
|
|
|
in -lreadline via the LIBS variable which is used globaly within Makefiles
|
|
|
when linking is done.
|
|
|
|
|
|
see: http://www.gnu.org/software/autoconf/manual/autoconf.html#Libraries
|
|
|
|
|
|
Note for the Fedora package maintainers:
|
|
|
|
|
|
Most probably you can omit following hackery within the lua.spec file by
|
|
|
using this patch.
|
|
|
|
|
|
http://pkgs.fedoraproject.org/gitweb/?p=lua.git;a=blob;f=lua.spec;h=8629717abaf46dbbe3497c26e39baaaf4dfa51e2;hb=HEAD#l61
|
|
|
|
|
|
-------------------snip--------------------------------------------------
|
|
|
make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl"
|
|
|
sed -i 's/-lreadline -lncurses //g' etc/lua.pc
|
|
|
-------------------snip--------------------------------------------------
|
|
|
|
|
|
Most probably there will be no need anymore for passing the make options
|
|
|
LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl".
|
|
|
|
|
|
Same applies to the mangling of the lua.pc file via sed, as the resulting
|
|
|
lua.pc file won't include '-lreadline -lncurses' anymore.
|
|
|
---
|
|
|
configure.ac | 5 +++--
|
|
|
src/Makefile.am | 2 +-
|
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/configure.ac lua-5.1.4-autotoolize/configure.ac
|
|
|
index 9690c49..5729acc 100644
|
|
|
--- lua-5.1.4/configure.ac
|
|
|
+++ lua-5.1.4-autotoolize/configure.ac
|
|
|
@@ -21,16 +21,17 @@ LUA_LIBS="-lm"
|
|
|
# Check for readline
|
|
|
READLINE_DEFS="#undef LUA_USE_READLINE"
|
|
|
if test "x$use_readline" == "xyes"; then
|
|
|
- AC_CHECK_LIB([readline], [readline], [], [use_readline=no], [-lncurses])
|
|
|
+ AC_CHECK_LIB([readline], [readline], [use_readline=yes], [use_readline=no], [-lncurses])
|
|
|
AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
|
|
|
if test "x$use_readline" == "xno"; then
|
|
|
AC_MSG_WARN([readline headers could not be found, disabling readline support])
|
|
|
else
|
|
|
READLINE_DEFS="#define LUA_USE_READLINE"
|
|
|
- LUA_LIBS="$LUA_LIBS -lreadline -lncurses"
|
|
|
+ READLINE_LIBS="$READLINE_LIBS -lreadline -lncurses"
|
|
|
fi
|
|
|
fi
|
|
|
AC_SUBST(READLINE_DEFS)
|
|
|
+AC_SUBST(READLINE_LIBS)
|
|
|
|
|
|
case "$host" in
|
|
|
*-mingw*) use_os=win32 ;;
|
|
|
diff --git lua-5.1.4/src/Makefile.am lua-5.1.4-autotoolize/src/Makefile.am
|
|
|
index 5bcad35..ee7e2db 100644
|
|
|
--- lua-5.1.4/src/Makefile.am
|
|
|
+++ lua-5.1.4-autotoolize/src/Makefile.am
|
|
|
@@ -18,7 +18,7 @@ liblua_la_SOURCES = \
|
|
|
bin_PROGRAMS = lua luac
|
|
|
|
|
|
lua_SOURCES = lua.c
|
|
|
-lua_LDADD = liblua.la @LUA_LIBS@
|
|
|
+lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
|
|
|
lua_DEPENDENCIES = liblua.la
|
|
|
|
|
|
luac_SOURCES = luac.c print.c
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From 0242330833b5624a074e0a8f720d9b0ef5c97cf5 Mon Sep 17 00:00:00 2001
|
|
|
From: Christian Wiese <chris@opensde.org>
|
|
|
Date: Wed, 22 Feb 2012 22:37:22 +0100
|
|
|
Subject: [PATCH 08/11] fix to not explicitely link against ncurses
|
|
|
|
|
|
There is no need to explicitely link against libncurses because linking against
|
|
|
libreadline will pull in the libraries it depends on.
|
|
|
One should also note, that ncurses libraries can be build seperately, which
|
|
|
means that readline (if configured to use curses instead of termcap) will be
|
|
|
only linked against libtinfo.
|
|
|
---
|
|
|
configure.ac | 4 ++--
|
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/configure.ac lua-5.1.4-autotoolize/configure.ac
|
|
|
index 5729acc..f5dfbc5 100644
|
|
|
--- lua-5.1.4/configure.ac
|
|
|
+++ lua-5.1.4-autotoolize/configure.ac
|
|
|
@@ -21,13 +21,13 @@ LUA_LIBS="-lm"
|
|
|
# Check for readline
|
|
|
READLINE_DEFS="#undef LUA_USE_READLINE"
|
|
|
if test "x$use_readline" == "xyes"; then
|
|
|
- AC_CHECK_LIB([readline], [readline], [use_readline=yes], [use_readline=no], [-lncurses])
|
|
|
+ AC_CHECK_LIB([readline], [readline], [use_readline=yes], [use_readline=no], [])
|
|
|
AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
|
|
|
if test "x$use_readline" == "xno"; then
|
|
|
AC_MSG_WARN([readline headers could not be found, disabling readline support])
|
|
|
else
|
|
|
READLINE_DEFS="#define LUA_USE_READLINE"
|
|
|
- READLINE_LIBS="$READLINE_LIBS -lreadline -lncurses"
|
|
|
+ READLINE_LIBS="$READLINE_LIBS -lreadline"
|
|
|
fi
|
|
|
fi
|
|
|
AC_SUBST(READLINE_DEFS)
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From d46d8635280f76f3ff427a674b0ee6b85dedb7f1 Mon Sep 17 00:00:00 2001
|
|
|
From: Christian Wiese <chris@opensde.org>
|
|
|
Date: Thu, 23 Feb 2012 14:37:06 +0100
|
|
|
Subject: [PATCH 10/11] fix to install docs when running make install
|
|
|
|
|
|
---
|
|
|
doc/Makefile.am | 11 ++++++++---
|
|
|
1 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/doc/Makefile.am lua-5.1.4-autotoolize/doc/Makefile.am
|
|
|
index 24b4044..db8c13c 100644
|
|
|
--- lua-5.1.4/doc/Makefile.am
|
|
|
+++ lua-5.1.4-autotoolize/doc/Makefile.am
|
|
|
@@ -1,5 +1,10 @@
|
|
|
man1_MANS = lua.1 luac.1
|
|
|
|
|
|
-EXTRA_DIST = \
|
|
|
- contents.html lua.1 luac.html lua.html manual.html \
|
|
|
- logo.gif luac.1 lua.css readme.html
|
|
|
\ No newline at end of file
|
|
|
+docdir = $(datadir)/doc/lua
|
|
|
+doc_DATA = \
|
|
|
+ contents.html lua.html luac.html manual.html readme.html \
|
|
|
+ lua.css manual.css \
|
|
|
+ amazon.gif logo.gif cover.png
|
|
|
+
|
|
|
+EXTRA_DIST = $(man1_MANS) $(doc_DATA)
|
|
|
+
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|
|
|
|
|
|
From 520e9ab108a2c47a1ed51e401597a5c2a4d05387 Mon Sep 17 00:00:00 2001
|
|
|
From: Christian Wiese <chris@opensde.org>
|
|
|
Date: Thu, 23 Feb 2012 14:45:21 +0100
|
|
|
Subject: [PATCH 11/11] improved to install COPYRIGHT HISTORY INSTALL README file into docdir
|
|
|
|
|
|
---
|
|
|
doc/Makefile.am | 1 +
|
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
|
diff --git lua-5.1.4/doc/Makefile.am lua-5.1.4-autotoolize/doc/Makefile.am
|
|
|
index db8c13c..72dbc31 100644
|
|
|
--- lua-5.1.4/doc/Makefile.am
|
|
|
+++ lua-5.1.4-autotoolize/doc/Makefile.am
|
|
|
@@ -2,6 +2,7 @@ man1_MANS = lua.1 luac.1
|
|
|
|
|
|
docdir = $(datadir)/doc/lua
|
|
|
doc_DATA = \
|
|
|
+ ../COPYRIGHT ../HISTORY ../INSTALL ../README \
|
|
|
contents.html lua.html luac.html manual.html readme.html \
|
|
|
lua.css manual.css \
|
|
|
amazon.gif logo.gif cover.png
|
|
|
--
|
|
|
1.7.2.3
|
|
|
|