diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-04-11 21:36:07 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-04-11 21:38:56 +0300 |
commit | e51f5cd6456a794e3f4464f72c10ad15032b2137 (patch) | |
tree | 5c50a4e5bac136ae656fcc05e2eb9c94a2081a99 /m4/libcurl.m4 | |
parent | df295571f2af48d6129704e644fabfec204ed259 (diff) | |
download | libmicrohttpd-e51f5cd6456a794e3f4464f72c10ad15032b2137.tar.gz libmicrohttpd-e51f5cd6456a794e3f4464f72c10ad15032b2137.zip |
Updated more M4 autoconf macros
Diffstat (limited to 'm4/libcurl.m4')
-rw-r--r-- | m4/libcurl.m4 | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 7e0a3c4c..53d694d0 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 | |||
@@ -1,3 +1,24 @@ | |||
1 | #*************************************************************************** | ||
2 | # _ _ ____ _ | ||
3 | # Project ___| | | | _ \| | | ||
4 | # / __| | | | |_) | | | ||
5 | # | (__| |_| | _ <| |___ | ||
6 | # \___|\___/|_| \_\_____| | ||
7 | # | ||
8 | # Copyright (C) 2006, David Shaw <dshaw@jabberwocky.com> | ||
9 | # | ||
10 | # This software is licensed as described in the file COPYING, which | ||
11 | # you should have received as part of this distribution. The terms | ||
12 | # are also available at https://curl.haxx.se/docs/copyright.html. | ||
13 | # | ||
14 | # You may opt to use, copy, modify, merge, publish, distribute and/or sell | ||
15 | # copies of the Software, and permit persons to whom the Software is | ||
16 | # furnished to do so, under the terms of the COPYING file. | ||
17 | # | ||
18 | # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
19 | # KIND, either express or implied. | ||
20 | # | ||
21 | ########################################################################### | ||
1 | # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], | 22 | # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], |
2 | # [ACTION-IF-YES], [ACTION-IF-NO]) | 23 | # [ACTION-IF-YES], [ACTION-IF-NO]) |
3 | # ---------------------------------------------------------- | 24 | # ---------------------------------------------------------- |
@@ -61,7 +82,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], | |||
61 | AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) | 82 | AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) |
62 | 83 | ||
63 | AC_ARG_WITH(libcurl, | 84 | AC_ARG_WITH(libcurl, |
64 | AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), | 85 | AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), |
65 | [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) | 86 | [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) |
66 | 87 | ||
67 | if test "$_libcurl_with" != "no" ; then | 88 | if test "$_libcurl_with" != "no" ; then |
@@ -153,11 +174,11 @@ int x; | |||
153 | curl_easy_setopt(NULL,CURLOPT_URL,NULL); | 174 | curl_easy_setopt(NULL,CURLOPT_URL,NULL); |
154 | x=CURL_ERROR_SIZE; | 175 | x=CURL_ERROR_SIZE; |
155 | x=CURLOPT_WRITEFUNCTION; | 176 | x=CURLOPT_WRITEFUNCTION; |
156 | x=CURLOPT_FILE; | 177 | x=CURLOPT_WRITEDATA; |
157 | x=CURLOPT_ERRORBUFFER; | 178 | x=CURLOPT_ERRORBUFFER; |
158 | x=CURLOPT_STDERR; | 179 | x=CURLOPT_STDERR; |
159 | x=CURLOPT_VERBOSE; | 180 | x=CURLOPT_VERBOSE; |
160 | if (x) ; | 181 | if (x) {;} |
161 | ]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) | 182 | ]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) |
162 | 183 | ||
163 | CPPFLAGS=$_libcurl_save_cppflags | 184 | CPPFLAGS=$_libcurl_save_cppflags |
@@ -201,8 +222,6 @@ if (x) ; | |||
201 | # protocols are available | 222 | # protocols are available |
202 | _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" | 223 | _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" |
203 | 224 | ||
204 | test -z "$_libcurl_version" && _libcurl_version=0 | ||
205 | |||
206 | if test x$libcurl_feature_SSL = xyes ; then | 225 | if test x$libcurl_feature_SSL = xyes ; then |
207 | _libcurl_protocols="$_libcurl_protocols HTTPS" | 226 | _libcurl_protocols="$_libcurl_protocols HTTPS" |
208 | 227 | ||