]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
linknx: select libcurl to fix autoreconf
authorBaruch Siach <baruch@tkos.co.il>
Wed, 16 Mar 2016 19:38:28 +0000 (21:38 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 29 Mar 2016 13:04:05 +0000 (15:04 +0200)
linknx configure.ac uses the LIBCURL_CHECK_CONFIG macro that is only defined
in libcurl.m4 that is part of libcurl. Select libcurl for now to fix
autoreconf.

Fixes:
http://autobuild.buildroot.net/results/96e/96e9ae0df7ebb7ad3d748a6b518cc59570e0b995/
http://autobuild.buildroot.net/results/179/17971c9f8925ff8623a7d97aac8eda0c287a76c9/
http://autobuild.buildroot.net/results/2a8/2a8af93d6439b313b048ccac7b6cfecbb6baff55/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/linknx/Config.in
package/linknx/linknx.mk

index 36838fed6c0f78f764808a0bd73e1ee629bbc74d..ca55c8bfb2f595902980b0b0d1da8acdca188b01 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LINKNX
        bool "linknx"
        select BR2_PACKAGE_LIBPTHSEM
+       select BR2_PACKAGE_LIBCURL # for autoreconf
        select BR2_PACKAGE_ARGP_STANDALONE \
               if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
        depends on BR2_INSTALL_LIBSTDCPP
index 9d1f75e122aa993d6344c497a325d670c0323f60..5dc8bb2d08398f636048a1fae1e987c0bfb22441 100644 (file)
@@ -15,9 +15,11 @@ LINKNX_CONF_OPTS = \
        --without-log4cpp \
        --without-pth-test \
        --with-pth=$(STAGING_DIR)/usr \
-       --disable-smtp
+       --disable-smtp \
+       --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
 
-LINKNX_DEPENDENCIES = libpthsem $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
+LINKNX_DEPENDENCIES = libpthsem libcurl \
+       $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
 
 # This is needed to make autoreconf happy
 define LINKNX_CREATE_MISSING_FILES
@@ -32,11 +34,4 @@ else
 LINKNX_CONF_OPTS += --without-mysql
 endif
 
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
-LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
-LINKNX_DEPENDENCIES += libcurl
-else
-LINKNX_CONF_OPTS += --without-libcurl
-endif
-
 $(eval $(autotools-package))