Changeset 5931

Timestamp:

03/25/10 18:16:20 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5908-r5911

Files:

• luci/branches/luci-0.9/contrib/package/luci/Makefile (modified) (7 diffs)

luci/branches/luci-0.9/contrib/package/luci/Makefile

@@ -241 +241 @@
 
 
-NIXIO_TLS:=axtls
+NIXIO_TLS:=cyassl
 
 define Package/luci-nixio
@@ -256 +256 @@
     choice
         prompt "TLS Provider"
-        default PACKAGE_luci-nixio_axtls
+        default PACKAGE_luci-nixio_cyassl
 
         config PACKAGE_luci-nixio_axtls
@@ -271 +271 @@
 endef
 
+ifneq ($(CONFIG_PACKAGE_luci-nixio_axtls),)
+  NIXIO_TLS:=axtls
+endif
+
 ifneq ($(CONFIG_PACKAGE_luci-nixio_openssl),)
   NIXIO_TLS:=openssl
@@ -304 +308 @@
 define Package/luci-web
   $(call Package/luci/libtemplate)
-  DEPENDS+=+luci-http +luci-sys +luci-uci +luci-lucid +luci-sgi-cgi +luci-lmo
+  DEPENDS+=+luci-http +luci-sys +luci-nixio +luci-uci \
+    +luci-sgi-cgi +luci-sgi-uhttpd +luci-lmo
   TITLE:=MVC Webframework
   $(call Config,luci.main.lang,string,en,Default Language)
@@ -335 +340 @@
   $(call Package/luci/fftemplate)
   DEPENDS+= \
-   +luci-lucid +luci-sgi-cgi +luci-app-splash \
+   +luci-web +luci-app-splash \
    +luci-app-ffwizard-leipzig \
    +luci-i18n-german \
@@ -668 +673 @@
   $(call Package/luci/webservertemplate)
   TITLE:=Binding for the uHTTPd server
-  DEPENDS+=+uhttpd
+  DEPENDS+=+uhttpd +px5g
 endef
 
@@ -679 +684 @@
 define Package/luci-theme-base
   $(call Package/luci/thtemplate)
-  DEPENDS:=+luci-web
+  DEPENDS:=
   TITLE:=Common base for all themes
 endef