merge from lp

src/lighttpd.c

@@ -2,7 +2,10 @@
 #include "base.h"
 #include "log.h"
 #include "config_parser.h"
+
+#ifdef HAVE_LUA_H
 #include "config_lua.h"
+#endif
 
 void plugin_core_init(server *srv, plugin *p);
 
@@ -64,8 +67,13 @@ int main(int argc, char *argv[]) {
 		}
 	}
 	else {
+#ifdef HAVE_LUA_H
 		config_lua_load(srv, config_path);
 		/* lua config frontend */
+#else
+		g_print("lua config frontend not available\n");
+		return 1;
+#endif
 	}
 
 	/* if config should only be tested, exit here  */

src/wscript

@@ -87,7 +87,9 @@ def build(bld):
 
 	main = bld.new_task_gen('cc', 'program')
 	main.name = 'lighttpd'
-	main.source = common_source + common_source_lua + main_source
+	main.source = common_source + main_source
+	if env['LIB_lua']:
+		main.source += common_source_lua
 	main.target='lighttpd' + env['APPEND']
 	main.uselib += 'lighty dl ev openssl pcre lua ' + common_uselib
 	main.includes = '.'
@@ -138,6 +140,8 @@ def build(bld):
 	tests.unit_test = 1
 	tests.name = 'tests'
 	tests.source = 'tests.c ' + common_source
+	if env['LIB_lua']:
+		tests.source += common_source_lua
 	tests.target = 'tests'
 	tests.uselib += 'lighty dl openssl pcre lua ' + common_uselib