[Astlinux-commits] SF.net SVN: astlinux:[6998] branches/1.0/package/libcurl/libcurl.mk

[<abe...@us...>]

Revision: 6998
          http://sourceforge.net/p/astlinux/code/6998
Author:   abelbeck
Date:     2015-03-08 00:57:39 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
libcurl, build tweaks

Modified Paths:
--------------
    branches/1.0/package/libcurl/libcurl.mk

Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk	2015-03-07 20:59:30 UTC (rev 6997)
+++ branches/1.0/package/libcurl/libcurl.mk	2015-03-08 00:57:39 UTC (rev 6998)
@@ -7,8 +7,20 @@
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.gz
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_INSTALL_STAGING = YES
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
 
+LIBCURL_DEPENDENCIES = host-pkg-config \
+	$(if $(BR2_PACKAGE_ZLIB),zlib) \
+	$(if $(BR2_PACKAGE_LIBIDN),libidn) \
+	$(if $(BR2_PACKAGE_OPENLDAP),openldap)
+
+LIBCURL_CONF_OPT = \
+	--disable-verbose \
+	--disable-manual \
+	--disable-ntlm-wb \
+	--enable-hidden-symbols \
+	--with-random=/dev/urandom \
+	--enable-ipv6
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
 LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
@@ -17,20 +29,12 @@
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl \
-	--with-random=/dev/urandom \
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
 	--with-ca-path=/usr/lib/ssl/certs
 else
 LIBCURL_CONF_OPT += --without-ssl
 endif
 
-ifeq ($(BR2_PACKAGE_OPENLDAP),y)
-LIBCURL_DEPENDENCIES += openldap
-endif
-
-LIBCURL_CONF_OPT += \
-	--enable-ipv6
-
 LIBCURL_CONF_ENV += \
 	CFLAGS="" \
 	CPPFLAGS='$(TARGET_CFLAGS)'

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.