1 diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
2 --- lua-5.3.0/configure.ac.autoxxx 2015-01-15 10:20:03.826889574 -0500
3 +++ lua-5.3.0/configure.ac 2015-01-15 10:20:03.826889574 -0500
6 +AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
7 +AC_SUBST([MAJOR_VERSION], [5.3])
9 +AC_CONFIG_HEADERS([config.h])
10 +AC_CONFIG_SRCDIR([src/lapi.c])
12 +AM_INIT_AUTOMAKE([1.9 foreign])
19 + [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
20 + [use_readline=$withval],
27 +READLINE_DEFS="#undef LUA_USE_READLINE"
28 +if test "x$use_readline" == "xyes"; then
29 + AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
30 + AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
31 + if test "x$use_readline" == "xno"; then
32 + AC_MSG_WARN([readline headers could not be found, disabling readline support])
34 + READLINE_DEFS="#define LUA_USE_READLINE"
35 + READLINE_LIBS="-lreadline -lncurses"
38 +AC_SUBST(READLINE_DEFS)
39 +AC_SUBST(READLINE_LIBS)
42 + *-mingw*) use_os=win32 ;;
43 + *-darwin*) use_os=macosx ;;
47 +POSIX_DEFS="#undef LUA_USE_POSIX"
48 +LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
49 +LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
51 +if test "x$use_os" == "xwin32"; then
52 + LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
53 +elif test "x$use_os" == "xmacosx"; then
54 + POSIX_DEFS="#define LUA_USE_POSIX"
55 + LUA_DL_DEFS="#define LUA_DL_DYLD"
56 +elif test "x$use_os" == "xposix"; then
57 + POSIX_DEFS="#define LUA_USE_POSIX"
58 + LUA_DL_DEFS="#define LUA_DL_DLOPEN"
59 + LUA_LIBS="$LUA_LIBS -ldl"
62 +AC_SUBST(LUA_DL_DEFS)
63 +AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
67 +AC_CONFIG_FILES([Makefile
70 + src/luaconf.h.template
74 diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am
75 --- lua-5.3.0/doc/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
76 +++ lua-5.3.0/doc/Makefile.am 2015-01-15 10:20:03.826889574 -0500
78 +man1_MANS = lua.1 luac.1
81 + contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
82 diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am
83 --- lua-5.3.0/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
84 +++ lua-5.3.0/Makefile.am 2015-01-15 10:20:03.826889574 -0500
89 diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore
90 --- lua-5.3.0/src/.gitignore.autoxxx 2015-01-15 10:20:03.826889574 -0500
91 +++ lua-5.3.0/src/.gitignore 2015-01-15 10:20:03.826889574 -0500
98 diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in
99 --- lua-5.3.0/src/luaconf.h.template.in.autoxxx 2015-01-15 10:20:03.828889562 -0500
100 +++ lua-5.3.0/src/luaconf.h.template.in 2015-01-15 10:22:37.420027778 -0500
107 +@LUA_BUILD_AS_DLL_DEFS@
112 ** ===================================================================
117 -#define LUA_ROOT "/usr/local/"
118 -#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
119 -#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
120 +#define LUA_ROOT "@prefix@/"
121 +#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/"
122 +#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/"
123 #define LUA_PATH_DEFAULT \
124 LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
125 LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
126 diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
127 --- lua-5.3.0/src/lua.pc.in.autoxxx 2015-01-15 10:20:03.827889568 -0500
128 +++ lua-5.3.0/src/lua.pc.in 2015-01-15 10:20:03.827889568 -0500
133 +exec_prefix=${prefix}
135 +includedir=${prefix}/include
138 +Description: An Extensible Extension Language
141 +Libs: -llua @LUA_LIBS@
142 +Cflags: -I${includedir}
143 diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
144 --- lua-5.3.0/src/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
145 +++ lua-5.3.0/src/Makefile.am 2015-01-15 10:20:03.826889574 -0500
149 +include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
151 +nodist_include_HEADERS = luaconf.h
153 +lib_LTLIBRARIES = liblua.la
154 +liblua_la_LDFLAGS = -release @MAJOR_VERSION@
155 +liblua_la_SOURCES = \
156 + lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
157 + ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
158 + loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
159 + ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
160 + lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
161 + lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
162 + lundump.h lvm.h lzio.h
164 +pkgconfigdir = $(libdir)/pkgconfig
165 +pkgconfig_DATA = lua.pc
167 +bin_PROGRAMS = lua luac
170 +lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
171 +lua_DEPENDENCIES = liblua.la
173 +luac_SOURCES = luac.c
174 +# Statically link liblua against luac since luac uses symbols not exported in liblua
175 +luac_LDADD = .libs/liblua.a @LUA_LIBS@
176 +luac_DEPENDENCIES = liblua.la
178 +EXTRA_DIST = luaconf.h.template
179 +BUILT_SOURCES = luaconf.h
180 +CLEANFILES = luaconf.h luaconf.h.template
182 +readline_defs = @READLINE_DEFS@
185 + -e 's,%prefix%,$(prefix),g' \
186 + -e 's,%lua_datadir%,$(datadir),g' \
187 + -e 's,%lua_libdir%,$(libdir),g'
189 +luaconf.h : luaconf.h.template