aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-08-24 17:07:05 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-16 23:18:32 (GMT)
commit1ce38476d96881221fb486a80f511feb80098416 (patch)
tree2a3a63da99a5eaae9e49ef6ee58fe84d225585e1
parent9ffa39982ed0b9e614b7d32b03492f58ef782558 (diff)
downloadfluxbox_pavel-1ce38476d96881221fb486a80f511feb80098416.zip
fluxbox_pavel-1ce38476d96881221fb486a80f511feb80098416.tar.bz2
Do not depend on readline
Readline is only used in the standalone lua interpreter, and we don't really need that. It would be silly to pull readline as a dependency for this reason.
-rw-r--r--libs/lua/src/Makefile4
-rw-r--r--libs/lua/src/luaconf.h7
2 files changed, 9 insertions, 2 deletions
diff --git a/libs/lua/src/Makefile b/libs/lua/src/Makefile
index e4a3cd6..ffc5715 100644
--- a/libs/lua/src/Makefile
+++ b/libs/lua/src/Makefile
@@ -96,7 +96,9 @@ generic:
96 $(MAKE) all MYCFLAGS= 96 $(MAKE) all MYCFLAGS=
97 97
98linux: 98linux:
99 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" 99 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
100# we don't want to depend on readline, see comment in luaconf.h
101# $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
100 102
101macosx: 103macosx:
102 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" 104 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
diff --git a/libs/lua/src/luaconf.h b/libs/lua/src/luaconf.h
index e2cb261..bc34b13 100644
--- a/libs/lua/src/luaconf.h
+++ b/libs/lua/src/luaconf.h
@@ -36,7 +36,12 @@
36#if defined(LUA_USE_LINUX) 36#if defined(LUA_USE_LINUX)
37#define LUA_USE_POSIX 37#define LUA_USE_POSIX
38#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ 38#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
39#define LUA_USE_READLINE /* needs some extra libraries */ 39/*
40 * we don't define LUA_USE_READLINE, because readline is only used in the standalone lua
41 * interpreter, and we don't really need that. It would be silly to pull readline as a dependency
42 * for this reason.
43 */
44//#define LUA_USE_READLINE /* needs some extra libraries */
40#endif 45#endif
41 46
42#if defined(LUA_USE_MACOSX) 47#if defined(LUA_USE_MACOSX)