From c5340d1dbf7299bbfa2d53128aeeadfb95b40abc Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 15 Dec 2013 15:32:37 +0000
Subject: uhttpd: don't process ubus_* and lua_* options if corresponding
 plugin is not installed (#14618)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39057 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/network/services/uhttpd/files/uhttpd.init | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 5b7686470b..9a76d8c1ff 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -67,10 +67,14 @@ start_instance()
 	append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
 	append_arg "$cfg" config "-c"
 	append_arg "$cfg" cgi_prefix "-x"
-	append_arg "$cfg" lua_prefix "-l"
-	append_arg "$cfg" lua_handler "-L"
-	append_arg "$cfg" ubus_prefix "-u"
-	append_arg "$cfg" ubus_socket "-U"
+	[ -f /usr/lib/uhttpd_lua.so ] && {
+		append_arg "$cfg" lua_prefix "-l"
+		append_arg "$cfg" lua_handler "-L"
+	}
+	[ -f /usr/lib/uhttpd_ubus.so ] && {
+		append_arg "$cfg" ubus_prefix "-u"
+		append_arg "$cfg" ubus_socket "-U"
+	}
 	append_arg "$cfg" script_timeout "-t"
 	append_arg "$cfg" network_timeout "-T"
 	append_arg "$cfg" http_keepalive "-k"
-- 
cgit v1.2.3