[vlc-devel] commit: LUA contrib: discard Linux readline support (not needed) ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Feb  9 23:40:14 2009 +0200| [4db7858c806ca585fd0dd027bcec8102d900efbc] | committer: Rémi Denis-Courmont 

LUA contrib: discard Linux readline support (not needed)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4db7858c806ca585fd0dd027bcec8102d900efbc
---

 extras/contrib/src/Makefile                     |    1 +
 extras/contrib/src/Patches/lua-noreadline.patch |   24 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index cf9c91e..f1e1446 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -656,6 +656,7 @@ ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a)
 	(cd $<; sed -i.orig 's at prefix= /usr/local at prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
 else
+	(cd $<; patch -p1) < Patches/lua-noreadline.patch
 	(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
 endif
 	touch $@
diff --git a/extras/contrib/src/Patches/lua-noreadline.patch b/extras/contrib/src/Patches/lua-noreadline.patch
new file mode 100644
index 0000000..862d3d1
--- /dev/null
+++ b/extras/contrib/src/Patches/lua-noreadline.patch
@@ -0,0 +1,24 @@
+LUA: do not use readline on Linux
+diff -ru lua-5.1/src/Makefile lua/src/Makefile
+--- lua-5.1/src/Makefile	2006-02-16 17:45:09.000000000 +0200
++++ lua/src/Makefile	2009-02-09 23:35:21.000000000 +0200
+@@ -92,7 +92,7 @@
+ 	$(MAKE) all MYCFLAGS=
+ 
+ linux:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
+ 
+ macosx:
+ 	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+diff -ru lua-5.1/src/luaconf.h lua/src/luaconf.h
+--- lua-5.1/src/luaconf.h	2006-02-10 19:44:06.000000000 +0200
++++ lua/src/luaconf.h	2009-02-09 23:33:29.000000000 +0200
+@@ -36,7 +36,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+-#define LUA_USE_READLINE	/* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)