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

diff --git a/net/nut/Makefile b/net/nut/Makefile
index 38605cc46b762136260c0aa6b0b97e64851a5049..d1229ada6e78bc20130ceb7407c224ad3029851e 100644 (file)
--- 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