Commit efd49e33 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

civetweb: rename lua option to match naming convention 



Suboptions of package foo should be prefixed with BR2_PACKAGE_FOO, not just
BR2_FOO.

Also add Config.in.legacy handling for it.

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent fc882cf2

Config.in.legacy

+9 −0
Original line number Diff line number Diff line
@@ -107,6 +107,15 @@ endif 
###############################################################################

comment "Legacy options removed in 2015.05"



config BR2_CIVETWEB_WITH_LUA

	bool "civetweb lua option renamed"

	select BR2_LEGACY

	select BR2_PACKAGE_CIVETWEB_WITH_LUA

	help

	  civetweb's lua option has been renamed to

	  BR2_PACKAGE_CIVETWEB_WITH_LUA to be aligned with how other

	  packages name options.



config BR2_PACKAGE_TIFF_TIFF2PDF

	bool "tiff utility-specific option removed"

	select BR2_LEGACY

package/civetweb/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config BR2_PACKAGE_CIVETWEB 


if BR2_PACKAGE_CIVETWEB



config BR2_CIVETWEB_WITH_LUA

config BR2_PACKAGE_CIVETWEB_WITH_LUA

	bool "enable Lua support"

	# required by the bundled Sqlite3 and Lua code

	depends on !BR2_STATIC_LIBS

package/civetweb/civetweb.mk

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ CIVETWEB_LIBS = -lpthread -lm 
CIVETWEB_SYSCONFDIR = /etc

CIVETWEB_HTMLDIR = /var/www



ifeq ($(BR2_CIVETWEB_WITH_LUA),y)

ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y)

CIVETWEB_CONF_OPTS += WITH_LUA=1

CIVETWEB_LIBS += -ldl

endif