| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | --- a/src/luaconf.h |
| 2 | +++ b/src/luaconf.h |
| 3 | @@ -61,14 +61,12 @@ |
| 4 | #if defined(LUA_USE_LINUX) |
| 5 | #define LUA_USE_POSIX |
| 6 | #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ |
| 7 | -#define LUA_USE_READLINE /* needs some extra libraries */ |
| 8 | #endif |
| 9 | |
| 10 | |
| 11 | #if defined(LUA_USE_MACOSX) |
| 12 | #define LUA_USE_POSIX |
| 13 | #define LUA_USE_DLOPEN /* MacOS does not need -ldl */ |
| 14 | -#define LUA_USE_READLINE /* needs an extra library: -lreadline */ |
| 15 | #endif |
| 16 | |
| 17 | |
| 18 | --- a/src/Makefile |
| 19 | +++ b/src/Makefile |
| 20 | @@ -23,6 +23,7 @@ MYCFLAGS= |
| 21 | MYLDFLAGS= |
| 22 | MYLIBS= |
| 23 | MYOBJS= |
| 24 | +# USE_READLINE=1 |
| 25 | |
| 26 | # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= |
| 27 | |
| 28 | @@ -96,6 +97,7 @@ echo: |
| 29 | |
| 30 | # Convenience targets for popular platforms |
| 31 | ALL= all |
| 32 | +RFLAG=$(if $(USE_READLINE),-DLUA_USE_READLINE) |
| 33 | |
| 34 | none: |
| 35 | @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" |
| 36 | @@ -115,15 +117,15 @@ c89: |
| 37 | |
| 38 | |
| 39 | freebsd: |
| 40 | - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc" |
| 41 | + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX $(RFLAG) -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc" |
| 42 | |
| 43 | generic: $(ALL) |
| 44 | |
| 45 | linux: |
| 46 | - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" |
| 47 | + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" $(RFLAG) SYSLIBS="-Wl,-E -ldl $(if $(USE_READLINE), -lreadline)" |
| 48 | |
| 49 | macosx: |
| 50 | - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" |
| 51 | + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" $(RFLAG) SYSLIBS="$(if $(USE_READLINE), -lreadline)" |
| 52 | |
| 53 | mingw: |
| 54 | $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \ |