diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2019-11-27 19:41:40 +0100 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2019-11-27 19:42:54 +0100 |
| commit | cdd660a41dbfb87c9a253a7ebf856d7b733b752f (patch) | |
| tree | 41d6de38f92f9398878d55d2cf9025ba38af0dc9 /net/nut | |
| parent | a08cc5b5330d213519bffaf0bb27476cd156b6b0 (diff) | |
nut: fix CGI setup
This commit makes
- the libgd dependency (as well as specifying libs and includes)
- the configure argument "--with-cgi"
dependant on whether the package nut-web-cgi is selected.
nut-web-cgi is also added to PKG_CONFIG_DEPENDS.
Resolves: #10641
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Diffstat (limited to 'net/nut')
| -rw-r--r-- | net/nut/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/nut/Makefile b/net/nut/Makefile index 38605cc46..d1229ada6 100644 --- a/net/nut/Makefile +++ b/net/nut/Makefile @@ -25,7 +25,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_NUT_DRIVER_SNMP \ CONFIG_NUT_DRIVER_USB \ CONFIG_NUT_DRIVER_SERIAL \ - CONFIG_NUT_SSL + CONFIG_NUT_SSL \ + CONFIG_PACKAGE_nut-web-cgi include $(INCLUDE_DIR)/package.mk @@ -301,7 +302,7 @@ endef define Package/nut-web-cgi $(call Package/nut/Default) TITLE+= Web CGI interface - DEPENDS:=nut +nut-common +libgd + DEPENDS:=nut +nut-common +PACKAGE_nut-web-cgi:libgd endef define Package/nut-web-cgi/description @@ -530,7 +531,7 @@ CONFIGURE_ARGS += \ --without-powerman \ --without-wrap \ --with-hotplug-dir=/etc/hotplug \ - --with-cgi \ + --with$(if $(CONFIG_PACKAGE_nut-web-cgi),,out)-cgi \ --without-ipmi \ --without-freeipmi \ --$(if $(CONFIG_NUT_SSL),with,without)-ssl $(if $(CONFIG_NUT_SSL),--with-openssl) \ @@ -538,7 +539,9 @@ CONFIGURE_ARGS += \ --with-statepath=/var/run/nut \ --with-drvpath=/lib/nut \ --with-user=root \ - --with-group=root + --with-group=root \ + $(if $(CONFIG_PACKAGE_nut-web-cgi),--with-gd-includes="`pkg-config --cflags gdlib`") \ + $(if $(CONFIG_PACKAGE_nut-web-cgi),--with-gd-libs="`pkg-config --libs gdlib`") define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig |