summaryrefslogtreecommitdiff
blob: d53f26492cb526b1962e751bb0e98deaddd47517 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
diff -ru freepops-0.0.99.orig/modules/modules freepops-0.0.99/modules/modules
--- freepops-0.0.99.orig/modules/modules	2006-01-13 10:47:33.000000000 +1100
+++ freepops-0.0.99/modules/modules	2007-01-27 13:51:53.000000000 +1100
@@ -1,4 +1,4 @@
-MODULES-Common= lua		\
+MODULES-Common= 		\
 		luacompat	\
 		luay		\
 		luabind 	\
diff -ru freepops-0.0.99.orig/modules/src/base64_lua/base64_lua.c freepops-0.0.99/modules/src/base64_lua/base64_lua.c
--- freepops-0.0.99.orig/modules/src/base64_lua/base64_lua.c	2006-01-14 08:46:54.000000000 +1100
+++ freepops-0.0.99/modules/src/base64_lua/base64_lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -15,8 +15,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
 #include "base64.h"
 #include "compat-5.1.h"
 
diff -ru freepops-0.0.99.orig/modules/src/crypto_lua/crypto_lua.c freepops-0.0.99/modules/src/crypto_lua/crypto_lua.c
--- freepops-0.0.99.orig/modules/src/crypto_lua/crypto_lua.c	2006-01-14 08:46:54.000000000 +1100
+++ freepops-0.0.99/modules/src/crypto_lua/crypto_lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -13,9 +13,9 @@
  * 	Name <gareuselesinge@users.sourceforge.net>
  ******************************************************************************/
 
-#include "lua.h"
+#include <lua.h>
 #include "luabind.h"
-#include "lauxlib.h"
+#include <lauxlib.h>
 #include "compat-5.1.h"
 
 #include <stdlib.h>
diff -ru freepops-0.0.99.orig/modules/src/luafull/Makefile freepops-0.0.99/modules/src/luafull/Makefile
--- freepops-0.0.99.orig/modules/src/luafull/Makefile	2005-06-09 00:57:12.000000000 +1000
+++ freepops-0.0.99/modules/src/luafull/Makefile	2007-01-27 13:51:53.000000000 +1100
@@ -111,7 +111,6 @@
 #		  $(RANLIB) ../../lib/liblualib-host.a )
 	$(H)($(RANLIB) ../../lib/liblua-host.a; \
 		$(RANLIB) ../../lib/liblualib-host.a; \
-		$(RANLIB) ../../lib/liblua.a; \
 		$(RANLIB) ../../lib/libluaexpat.a; \
 		$(RANLIB) ../../lib/libgetdate.a; \
 	        $(RANLIB) ../../lib/libluafilesystem.a	)
diff -ru freepops-0.0.99.orig/modules/src/luafull/lua.c freepops-0.0.99/modules/src/luafull/lua.c
--- freepops-0.0.99.orig/modules/src/luafull/lua.c	2004-11-17 02:25:38.000000000 +1100
+++ freepops-0.0.99/modules/src/luafull/lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -12,10 +12,10 @@
 
 #define lua_c
 
-#include "lua.h"
+#include <lua.h>
 
-#include "lauxlib.h"
-#include "lualib.h"
+#include <lauxlib.h>
+#include <lualib.h>
 
 
 /*
diff -ru freepops-0.0.99.orig/modules/src/luay/luay.c freepops-0.0.99/modules/src/luay/luay.c
--- freepops-0.0.99.orig/modules/src/luay/luay.c	2005-06-30 02:26:22.000000000 +1000
+++ freepops-0.0.99/modules/src/luay/luay.c	2007-01-27 13:51:53.000000000 +1100
@@ -16,7 +16,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "lua.h"
+#include <lua.h>
 #include "luay.h"
 
 #define LINE_PREFIX "LUAY: "
diff -ru freepops-0.0.99.orig/modules/src/mlex_lua/mlex_lua.c freepops-0.0.99/modules/src/mlex_lua/mlex_lua.c
--- freepops-0.0.99.orig/modules/src/mlex_lua/mlex_lua.c	2006-01-13 22:52:38.000000000 +1100
+++ freepops-0.0.99/modules/src/mlex_lua/mlex_lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
 #include "mlex.h"
 #include "list.h"
 
--- freepops-0.0.99.orig/modules/src/portablesocket_lua/psock_lua.c	2006-01-14 08:46:54.000000000 +1100
+++ freepops-0.0.99/modules/src/portablesocket_lua/psock_lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -16,8 +16,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
 #include "socketcommon.h"
 #include "luabind.h"
 
diff -ru freepops-0.0.99.orig/modules/src/regularexp_lua/regularexp_lua.c freepops-0.0.99/modules/src/regularexp_lua/regularexp_lua.c
--- freepops-0.0.99.orig/modules/src/regularexp_lua/regularexp_lua.c	2006-01-14 08:46:55.000000000 +1100
+++ freepops-0.0.99/modules/src/regularexp_lua/regularexp_lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -20,8 +20,8 @@
 #endif
 #include <regex.h>
 
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
 
 #include "luabind.h"
 
diff -ru freepops-0.0.99.orig/modules/src/stringhack_lua/stringhack_lua.c freepops-0.0.99/modules/src/stringhack_lua/stringhack_lua.c
--- freepops-0.0.99.orig/modules/src/stringhack_lua/stringhack_lua.c	2006-01-14 08:46:55.000000000 +1100
+++ freepops-0.0.99/modules/src/stringhack_lua/stringhack_lua.c	2007-01-27 13:51:53.000000000 +1100
@@ -15,8 +15,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
 #include "lstringhack.h"
 
 #include "compat-5.1.h"
diff -ru freepops-0.0.99.orig/src/Makefile freepops-0.0.99/src/Makefile
--- freepops-0.0.99.orig/src/Makefile	2006-04-09 23:52:57.000000000 +1000
+++ freepops-0.0.99/src/Makefile	2007-01-27 13:51:53.000000000 +1100
@@ -47,8 +47,8 @@
 #	CFLAGS+= -DFREEPOPSLUA_PATH_UNOFFICIAL=\"$HOME/config/settings/freepops/lua_unofficial/\"
 #
 #else
-	CFLAGS+= -DFREEPOPSLUA_PATH=\"$(PREFIX)share/freepops/lua/\"
-	CFLAGS+= -DFREEPOPSLUA_PATH_UNOFFICIAL=\"$(PREFIX)share/freepops/lua_unofficial/\"
+	CFLAGS+= -DFREEPOPSLUA_PATH=\"/usr/share/freepops/lua/\"
+	CFLAGS+= -DFREEPOPSLUA_PATH_UNOFFICIAL=\"/usr/share/freepops/lua_unofficial/\"
 #endif
 endif
 endif
@@ -99,9 +99,7 @@
 		luaexpat	\
 		luafilesystem	\
                 luay            \
-		luacompat-5.1	\
-                lua             \
-                lualib          
+		luacompat-5.1
 		
 EXCLUDELIBS=	serialize_lua \
 		browser_lua \
@@ -109,7 +107,7 @@
 		
 LIBSTOLINK=$(filter-out $(EXCLUDELIBS),$(LIBS))
 
-LDFLAGS=$(FORCE_LINK)
+LDFLAGS=$(FORCE_LINK) -llua -llualib
 		
 ifeq "$(OS)" "Windows"
   ifeq "$(SSL)" "openssl"
diff -ru freepops-0.0.99.orig/src/engine.c freepops-0.0.99/src/engine.c
--- freepops-0.0.99.orig/src/engine.c	2006-01-16 06:43:15.000000000 +1100
+++ freepops-0.0.99/src/engine.c	2007-01-27 13:51:53.000000000 +1100
@@ -24,9 +24,9 @@
 #include "popserver.h"
 #include "popstate.h"
 
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
 #include "luay.h"
 
 #include "luabox.h"
diff -ru freepops-0.0.99.orig/src/engine.h freepops-0.0.99/src/engine.h
--- freepops-0.0.99.orig/src/engine.h	2005-06-30 02:26:27.000000000 +1000
+++ freepops-0.0.99/src/engine.h	2007-01-27 13:51:53.000000000 +1100
@@ -19,7 +19,7 @@
 
 #include "popserver.h"
 #include "popstate.h"
-#include "lua.h"
+#include <lua.h>
 
 /**
  * \brief this struct is the implementation of webmail access
diff -ru freepops-0.0.99.orig/src/freepops.c freepops-0.0.99/src/freepops.c
--- freepops-0.0.99.orig/src/freepops.c	2006-01-16 06:43:15.000000000 +1100
+++ freepops-0.0.99/src/freepops.c	2007-01-27 13:51:53.000000000 +1100
@@ -61,10 +61,10 @@
 #include "altsocklib.h"
 #include "regularexp.h"
 
-#include "lua.h"
+#include <lua.h>
 #include "luay.h"
-#include "luabox.h"
-#include "lauxlib.h"
+#include <luabox.h>
+#include <lauxlib.h>
 #include "luay.h"
 
 #include "log.h"
diff -ru freepops-0.0.99.orig/src/luabox.c freepops-0.0.99/src/luabox.c
--- freepops-0.0.99.orig/src/luabox.c	2005-06-11 10:28:11.000000000 +1000
+++ freepops-0.0.99/src/luabox.c	2007-01-27 13:52:33.000000000 +1100
@@ -13,9 +13,9 @@
  * 	Enrico Tassi <gareuselesinge@users.sourceforge.net>
  ******************************************************************************/
 
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
 #include "luay.h"
 
 #include "luabox.h"