diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-24 17:07:05 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 10:04:04 (GMT) |
commit | 85ac5c4b2c6a526992f483a6e91867dc2f82a19e (patch) | |
tree | bea5be1b9b551c30c7197d5dbef67136f4757858 /libs | |
parent | e1dd8320a430c145ef37914e902558130856b430 (diff) | |
download | fluxbox_pavel-master.zip fluxbox_pavel-master.tar.bz2 |
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.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/lua/src/Makefile | 4 | ||||
-rw-r--r-- | libs/lua/src/luaconf.h | 7 |
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 | ||
98 | linux: | 98 | linux: |
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 | ||
101 | macosx: | 103 | macosx: |
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) |