Changeset f78c412 in freewrt

Timestamp:

Jun 26, 2007, 3:31:38 PM (18 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Children:

ee44276

Parents:

e3110e9

Message:

let the user decide if ssl should be enabled, requested by ms@

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2923 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/lighttpd

Files:

• Config.in (modified) (2 diffs)
• Makefile (modified) (3 diffs)

package/lighttpd/Config.in

@@ -5 +5 @@
         tristate 
         default n
-        select FWRT_PACKAGE_LIBOPENSSL
         select FWRT_PACKAGE_LIBPCRE
         help
@@ -11 +10 @@
           
           http://www.lighttpd.net/
-          
-          Depends: libopenssl, libpcre
+
+choice
+prompt "SSL Configuration"
+depends on FWRT_PACKAGE_LIGHTTPD
+default FWRT_COMPILE_LIGHTTPD_WITHOUT_OPENSSL
+
+config FWRT_COMPILE_LIGHTTPD_WITHOUT_OPENSSL
+        bool "no ssl encryption support"
+        help
+
+config FWRT_COMPILE_LIGHTTPD_WITH_OPENSSL
+        bool "enable openssl encryption support"
+        depends FWRT_PACKAGE_LIGHTTPD
+        select FWRT_PACKAGE_LIBOPENSSL
+        help
+
+endchoice
 
 config FWRT_PACKAGE_LIGHTTPD_MOD_ACCESSLOG

package/lighttpd/Makefile

@@ -9 +9 @@
 PKG_NAME:=              lighttpd
 PKG_VERSION:=           1.4.15
-PKG_RELEASE:=           1
+PKG_RELEASE:=           2
 PKG_MD5SUM:=            d2ceaaf242b2b3593ff4d8222d543649
 MASTER_SITES:=          http://www.lighttpd.net/download/
@@ -60 +60 @@
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
 
+SSL:=--without-openssl
+ifeq ($(FWRT_COMPILE_LIGHTTPD_WITH_OPENSSL),y)
+SSL:=--with-openssl="$(STAGING_DIR)/usr"
+PKG_DEPEND+=", libopenssl"
+endif
+
 TCPPFLAGS+=             -I$(STAGING_DIR)/usr/include/libxml2
 CONFIGURE_STYLE=        gnu
 CONFIGURE_ENV+=         PCRE_LIB="-lpcre"
-CONFIGURE_ARGS+=        --libdir=/usr/lib/lighttpd \
+CONFIGURE_ARGS+=        ${SSL} \
+                        --libdir=/usr/lib/lighttpd \
                         --sysconfdir=/etc/lighttpd \
                         --without-attr \
@@ -73 +80 @@
                         --without-memcache \
                         --without-mysql \
-                        --with-openssl="$(STAGING_DIR)/usr" \
                         --with-pcre \
                         --without-valgrind \