aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2018-03-02 15:31:51 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2018-03-02 15:31:51 -0300
commit0eb10c6303dadf29be349b0331e6029b5ae03298 (patch)
tree998db20a6ce3daa6f032f88b2b291fbd6273b4d2
parent00008b8ed0aca4540a2d5480316a01c7172fb8ba (diff)
downloadlua-0eb10c6303dadf29be349b0331e6029b5ae03298.tar.gz
lua-0eb10c6303dadf29be349b0331e6029b5ae03298.tar.bz2
lua-0eb10c6303dadf29be349b0331e6029b5ae03298.zip
'LUA_USE_READLINE' moved to the make file
-rw-r--r--luaconf.h4
-rw-r--r--makefile2
2 files changed, 2 insertions, 4 deletions
diff --git a/luaconf.h b/luaconf.h
index e600bbf1..5a62ddac 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: luaconf.h,v 1.264 2018/02/20 20:52:50 roberto Exp roberto $ 2** $Id: luaconf.h,v 1.265 2018/02/27 18:47:32 roberto Exp roberto $
3** Configuration file for Lua 3** Configuration file for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -61,14 +61,12 @@
61#if defined(LUA_USE_LINUX) 61#if defined(LUA_USE_LINUX)
62#define LUA_USE_POSIX 62#define LUA_USE_POSIX
63#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ 63#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
64#define LUA_USE_READLINE /* needs some extra libraries */
65#endif 64#endif
66 65
67 66
68#if defined(LUA_USE_MACOSX) 67#if defined(LUA_USE_MACOSX)
69#define LUA_USE_POSIX 68#define LUA_USE_POSIX
70#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ 69#define LUA_USE_DLOPEN /* MacOS does not need -ldl */
71#define LUA_USE_READLINE /* needs an extra library: -lreadline */
72#endif 70#endif
73 71
74 72
diff --git a/makefile b/makefile
index 1a98ccd9..b298486e 100644
--- a/makefile
+++ b/makefile
@@ -54,7 +54,7 @@ LOCAL = $(TESTS) $(CWARNS) -g -DEXTERNMEMCHECK
54 54
55 55
56# enable Linux goodies 56# enable Linux goodies
57MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_LINUX 57MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_LINUX -DLUA_USE_READLINE
58MYLDFLAGS= $(LOCAL) -Wl,-E 58MYLDFLAGS= $(LOCAL) -Wl,-E
59MYLIBS= -ldl -lreadline 59MYLIBS= -ldl -lreadline
60 60