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 <redacted>

diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile
index 92d87b8e052f78854adf5ec633ed9718bc2356f1..20ef50ea7d1e186e434be5ab25efc15ac71da983 100644 (file)
--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@@ -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.
 # See /LICENSE for more information.
@@ -92,7 +92,7 @@ else
   CONFIGURE_ARGS+= --without-ldap
 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
 else
   CONFIGURE_ARGS+= --without-mysql
@@ -110,12 +110,6 @@ else
   CONFIGURE_ARGS+= --without-lua
 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),)
 #  CONFIGURE_ARGS+= --with-memcached
 #else