Attachment #557920 for bug #671248

View | Details | Raw Unified | Return to bug 671248
Collapse All | Expand All

Line 0 Link Here

(-)a/.gitignore (+11 lines)
	1	lua
	2	lua.pc
	3	luac
	4	luaconf.h
	5	luaconf.h.template
	6	*.o
	7	*.lo
	8	Makefile
	9	Makefile.in
	10	.deps
	11	.libs

Line 0 Link Here

(-)a/Makefile.am (+3 lines)
	1	SUBDIRS = src doc
	2
	3	EXTRA_DIST = README




AC_PREREQ(2.59)
AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
AC_SUBST([MAJOR_VERSION], [5.3])

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(
  [compat-module],
  [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
  [use_compat_module=$withval],
  [use_compat_module=no]
)

COMPAT_DEFS="#undef LUA_COMPAT_ALL"
if test "x$use_compat_module" == "xyes"; then
  COMPAT_DEFS="#define LUA_COMPAT_5_1
#define LUA_COMPAT_5_2"
fi
AC_SUBST(COMPAT_DEFS)

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"
    READLINE_LIBS="-lreadline -lncurses"
  fi
fi
AC_SUBST(READLINE_DEFS)
AC_SUBST(READLINE_LIBS)

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/lua$MAJOR_VERSION.pc
                 src/luaconf.h.template
                 doc/Makefile
])
AC_OUTPUT

Line 0 Link Here

(-)a/doc/Makefile.am (+4 lines)
	1	man1_MANS = lua.1 luac.1
	2
	3	EXTRA_DIST = \
	4	contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html




AM_CFLAGS = -Wall

include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp

nodist_include_HEADERS = luaconf.h

pkglib_LTLIBRARIES = liblua.la
liblua_la_LDFLAGS = -release @MAJOR_VERSION@
liblua_la_SOURCES = \
	lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
	ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
	loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
	ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
	lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
	lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
	lundump.h lvm.h lzio.h

# Static library for intrenal linking with luac
noinst_LTLIBRARIES = libluac.la
libluac_la_SOURCES = ${liblua_la_SOURCES}

pkglibdir = $(libdir)/lua/@MAJOR_VERSION@

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = lua@MAJOR_VERSION@.pc

bin_PROGRAMS = lua luac

lua_SOURCES = lua.c
lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
lua_DEPENDENCIES = liblua.la

luac_SOURCES = luac.c
luac_LDADD = .libs/libluac.a @LUA_LIBS@
luac_DEPENDENCIES = libluac.la

EXTRA_DIST = luaconf.h.template
BUILT_SOURCES = luaconf.h
CLEANFILES = luaconf.h luaconf.h.template

readline_defs = @READLINE_DEFS@

edit = 	sed \
	  -e 's,%prefix%,$(prefix),g' \
	  -e 's,%lua_datadir%,$(datadir),g' \
	  -e 's,%lua_libdir%,$(libdir),g'

luaconf.h : luaconf.h.template
	rm -f $@ $@.tmp
	$(edit) $< >$@.tmp
	mv $@.tmp $@




V= @MAJOR_VERSION@
R= @VERSION@
prefix= @prefix@
exec_prefix=${prefix}
libdir= @libdir@/lua/@MAJOR_VERSION@
includedir=@includedir@

Name: Lua
Description: An Extensible Extension Language
Version: ${R}
Requires:
Libs: -L${libdir} -llua @LUA_LIBS@
Cflags: -I${includedir}




#include <limits.h>
#include <stddef.h>

@POSIX_DEFS@
@LUA_DL_DEFS@
@LUA_BUILD_AS_DLL_DEFS@
@READLINE_DEFS@
@COMPAT_DEFS@


/*
** ===================================================================


#else			/* }{ */

#define LUA_ROOT	"@prefix@/"
#define LUA_LDIR	"@datadir@/lua/" LUA_VDIR "/"
#define LUA_CDIR	"@libdir@/lua/" LUA_VDIR "/"
#define LUA_PATH_DEFAULT  \
		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
- 

Return to bug 671248

Lines 11-16 Link Here

(-)a/src/luaconf.h (-4 / +9 lines)
11	#include <limits.h>	11	#include <limits.h>
12	#include <stddef.h>	12	#include <stddef.h>
13		13
		14	@POSIX_DEFS@
		15	@LUA_DL_DEFS@
		16	@LUA_BUILD_AS_DLL_DEFS@
		17	@READLINE_DEFS@
		18	@COMPAT_DEFS@
		19
14		20
15	/*	21	/*
16	** ===================================================================	22	** ===================================================================
Lines 200-208 Link Here
200		206
201	#else /* }{ */	207	#else /* }{ */
202		208
203	#define LUA_ROOT "/usr/local/"	209	#define LUA_ROOT "@prefix@/"
204	#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"	210	#define LUA_LDIR "@datadir@/lua/" LUA_VDIR "/"
205	#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"	211	#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/"
206	#define LUA_PATH_DEFAULT \	212	#define LUA_PATH_DEFAULT \
207	LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \	213	LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
208	LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \	214	LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
209	-

Line 0 Link Here

(-)a/configure.ac (+83 lines)
		1	AC_PREREQ(2.59)
		2	AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
		3	AC_SUBST([MAJOR_VERSION], [5.3])
		4
		5	AC_CONFIG_HEADERS([config.h])
		6	AC_CONFIG_SRCDIR([src/lapi.c])
		7
		8	AM_INIT_AUTOMAKE([1.9 foreign])
		9
		10	AC_PROG_CC
		11	AC_PROG_LIBTOOL
		12
		13	AC_ARG_WITH(
		14	[compat-module],
		15	[AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
		16	[use_compat_module=$withval],
		17	[use_compat_module=no]
		18	)
		19
		20	COMPAT_DEFS="#undef LUA_COMPAT_ALL"
		21	if test "x$use_compat_module" == "xyes"; then
		22	COMPAT_DEFS="#define LUA_COMPAT_5_1
		23	#define LUA_COMPAT_5_2"
		24	fi
		25	AC_SUBST(COMPAT_DEFS)
		26
		27	AC_ARG_WITH(
		28	[readline],
		29	[AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
		30	[use_readline=$withval],
		31	[use_readline=yes]
		32	)
		33
		34	LUA_LIBS="-lm"
		35
		36	# Check for readline
		37	READLINE_DEFS="#undef LUA_USE_READLINE"
		38	if test "x$use_readline" == "xyes"; then
		39	AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
		40	AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
		41	if test "x$use_readline" == "xno"; then
		42	AC_MSG_WARN([readline headers could not be found, disabling readline support])
		43	else
		44	READLINE_DEFS="#define LUA_USE_READLINE"
		45	READLINE_LIBS="-lreadline -lncurses"
		46	fi
		47	fi
		48	AC_SUBST(READLINE_DEFS)
		49	AC_SUBST(READLINE_LIBS)
		50
		51	case "$host" in
		52	-mingw) use_os=win32 ;;
		53	-darwin) use_os=macosx ;;
		54	*) use_os=posix ;;
		55	esac
		56
		57	POSIX_DEFS="#undef LUA_USE_POSIX"
		58	LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
		59	LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
		60
		61	if test "x$use_os" == "xwin32"; then
		62	LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
		63	elif test "x$use_os" == "xmacosx"; then
		64	POSIX_DEFS="#define LUA_USE_POSIX"
65	LUA_DL_DEFS="#define LUA_DL_DYLD"
66	elif test "x$use_os" == "xposix"; then
67	POSIX_DEFS="#define LUA_USE_POSIX"
68	LUA_DL_DEFS="#define LUA_DL_DLOPEN"
69	LUA_LIBS="$LUA_LIBS -ldl"
70	fi
71	AC_SUBST(POSIX_DEFS)
72	AC_SUBST(LUA_DL_DEFS)
73	AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
74
75	AC_SUBST(LUA_LIBS)
76
77	AC_CONFIG_FILES([Makefile
78	src/Makefile
79	src/lua$MAJOR_VERSION.pc
80	src/luaconf.h.template
81	doc/Makefile
82	])
83	AC_OUTPUT

Line 0 Link Here

(-)a/src/Makefile.am (+51 lines)
	1	AM_CFLAGS = -Wall
	2
	3	include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
	4
	5	nodist_include_HEADERS = luaconf.h
	6
	7	pkglib_LTLIBRARIES = liblua.la
	8	liblua_la_LDFLAGS = -release @MAJOR_VERSION@
	9	liblua_la_SOURCES = \
	10	lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
	11	ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
	12	loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
	13	ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
	14	lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
	15	lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
	16	lundump.h lvm.h lzio.h
	17
	18	# Static library for intrenal linking with luac
	19	noinst_LTLIBRARIES = libluac.la
	20	libluac_la_SOURCES = ${liblua_la_SOURCES}
	21
	22	pkglibdir = $(libdir)/lua/@MAJOR_VERSION@
	23
	24	pkgconfigdir = $(libdir)/pkgconfig
	25	pkgconfig_DATA = lua@MAJOR_VERSION@.pc
	26
	27	bin_PROGRAMS = lua luac
	28
	29	lua_SOURCES = lua.c
	30	lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
	31	lua_DEPENDENCIES = liblua.la
	32
	33	luac_SOURCES = luac.c
	34	luac_LDADD = .libs/libluac.a @LUA_LIBS@
	35	luac_DEPENDENCIES = libluac.la
	36
	37	EXTRA_DIST = luaconf.h.template
	38	BUILT_SOURCES = luaconf.h
	39	CLEANFILES = luaconf.h luaconf.h.template
	40
	41	readline_defs = @READLINE_DEFS@
	42
	43	edit = sed \
	44	-e 's,%prefix%,$(prefix),g' \
	45	-e 's,%lua_datadir%,$(datadir),g' \
	46	-e 's,%lua_libdir%,$(libdir),g'
	47
	48	luaconf.h : luaconf.h.template
	49	rm -f $@ $@.tmp
	50	$(edit) $< >$@.tmp
	51	mv $@.tmp $@

Line 0 Link Here

(-)a/src/lua5.3.pc.in (+13 lines)
	1	V= @MAJOR_VERSION@
	2	R= @VERSION@
	3	prefix= @prefix@
	4	exec_prefix=${prefix}
	5	libdir= @libdir@/lua/@MAJOR_VERSION@
	6	includedir=@includedir@
	7
	8	Name: Lua
	9	Description: An Extensible Extension Language
	10	Version: ${R}
	11	Requires:
	12	Libs: -L${libdir} -llua @LUA_LIBS@
	13	Cflags: -I${includedir}