diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-11-26 21:46:47 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-03 18:03:15 +0100 |
| commit | a61beb4b0fd41b77c71bf14e17db02bbace3a65b (patch) | |
| tree | 006c01f246f91fe441cc9a465da98c7caece38f8 | |
| parent | 0d0959df07bbc248d372325ee37077ad70689a39 (diff) | |
| download | ptxdist-a61beb4b0fd41b77c71bf14e17db02bbace3a65b.tar.gz ptxdist-a61beb4b0fd41b77c71bf14e17db02bbace3a65b.tar.xz | |
[libcurl] convert __ -> _
__ in config symbols are obsolete
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/libcurl.in | 20 | ||||
| -rw-r--r-- | rules/libcurl.make | 16 |
2 files changed, 18 insertions, 18 deletions
diff --git a/rules/libcurl.in b/rules/libcurl.in index e7833fa99..544fd9716 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -2,8 +2,8 @@ menuconfig LIBCURL tristate prompt "libcurl " - select OPENSSL if LIBCURL__SSL select ZLIB + select OPENSSL if LIBCURL_SSL help curl is a command line tool for transferring files with URL syntax, supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE. @@ -14,32 +14,32 @@ menuconfig LIBCURL if LIBCURL -config LIBCURL__CURL +config LIBCURL_CURL bool "install curl program" -config LIBCURL__HTTP +config LIBCURL_HTTP bool "http" default y -config LIBCURL__COOKIES +config LIBCURL_COOKIES bool "cookies support" - depends on LIBCURL__HTTP + depends on LIBCURL_HTTP -config LIBCURL__FTP +config LIBCURL_FTP bool "ftpt" default y -config LIBCURL__FILE +config LIBCURL_FILE bool "file" -config LIBCURL__SSL +config LIBCURL_SSL bool "ssl" depends on BROKEN -config LIBCURL__CRYPTO_AUTH +config LIBCURL_CRYPTO_AUTH bool "cryptographic authentication" -config LIBCURL__IPV6 +config LIBCURL_IPV6 bool "ipv6" endif diff --git a/rules/libcurl.make b/rules/libcurl.make index 418a46256..6860284b4 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -76,43 +76,43 @@ LIBCURL_AUTOCONF := \ --without-ca-path \ --without-libidn -ifdef PTXCONF_LIBCURL__HTTP +ifdef PTXCONF_LIBCURL_HTTP LIBCURL_AUTOCONF += --enable-http else LIBCURL_AUTOCONF += --disable-http endif -ifdef PTXCONF_LIBCURL__COOKIES +ifdef PTXCONF_LIBCURL_COOKIES LIBCURL_AUTOCONF += --enable-cookies else LIBCURL_AUTOCONF += --disable-cookies endif -ifdef PTXCONF_LIBCURL__FTP +ifdef PTXCONF_LIBCURL_FTP LIBCURL_AUTOCONF += --enable-ftp else LIBCURL_AUTOCONF += --disable-ftp endif -ifdef PTXCONF_LIBCURL__FILE +ifdef PTXCONF_LIBCURL_FILE LIBCURL_AUTOCONF += --enable-file else LIBCURL_AUTOCONF += --disable-file endif -ifdef PTXCONF_LIBCURL__SSL +ifdef PTXCONF_LIBCURL_SSL LIBCURL_AUTOCONF += --with-ssl=$(SYSROOT) else LIBCURL_AUTOCONF += --without-ssl endif -ifdef PTXCONF_LIBCURL__CRYPTO_AUTH +ifdef PTXCONF_LIBCURL_CRYPTO_AUTH LIBCURL_AUTOCONF += --enable-crypto-auth else LIBCURL_AUTOCONF += --disable-crypto-auth endif -ifdef PTXCONF_LIBCURL__IPV6 +ifdef PTXCONF_LIBCURL_IPV6 LIBCURL_AUTOCONF += --enable-ipv6 else LIBCURL_AUTOCONF += --disable-ipv6 @@ -134,7 +134,7 @@ $(STATEDIR)/libcurl.targetinstall: @$(call install_fixup, libcurl,DEPENDS,) @$(call install_fixup, libcurl,DESCRIPTION,missing) -ifdef PTXCONF_LIBCURL__CURL +ifdef PTXCONF_LIBCURL_CURL @$(call install_copy, libcurl, 0, 0, 0755, -, /usr/bin/curl) endif |