Browse Source

lighttpd: fix CONFIGURE_ARGS

With the current layout CONFIGURE_ARGS can end up like this:

--with-mysql --without-mysql

To avoid that join the ifneqs of the two mysql related plugins.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
lilik-openwrt-22.03
Sebastian Kemper 6 years ago
parent
commit
b43e63b66d
1 changed files with 2 additions and 8 deletions
  1. +2
    -8
      net/lighttpd/Makefile

+ 2
- 8
net/lighttpd/Makefile View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org
# Copyright (C) 2006-2018 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -92,7 +92,7 @@ else
CONFIGURE_ARGS+= --without-ldap CONFIGURE_ARGS+= --without-ldap
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-authn_mysql),)
ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-authn_mysql)$(CONFIG_PACKAGE_lighttpd-mod-mysql_vhost),)
CONFIGURE_ARGS+= --with-mysql CONFIGURE_ARGS+= --with-mysql
else else
CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --without-mysql
@ -110,12 +110,6 @@ else
CONFIGURE_ARGS+= --without-lua CONFIGURE_ARGS+= --without-lua
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-mysql_vhost),)
CONFIGURE_ARGS+= --with-mysql
else
CONFIGURE_ARGS+= --without-mysql
endif
#ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-cml)$(CONFIG_PACKAGE_lighttpd-mod-trigger_b4_dl),) #ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-cml)$(CONFIG_PACKAGE_lighttpd-mod-trigger_b4_dl),)
# CONFIGURE_ARGS+= --with-memcached # CONFIGURE_ARGS+= --with-memcached
#else #else


Loading…
Cancel
Save