diff options
-rw-r--r-- | configure.ac | 18 | ||||
-rw-r--r-- | m4/libcurl.m4 | 250 | ||||
-rw-r--r-- | m4/libgnurl.m4 | 250 | ||||
-rw-r--r-- | src/gns/Makefile.am | 4 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 16 | ||||
-rw-r--r-- | src/pt/Makefile.am | 36 | ||||
-rw-r--r-- | src/transport/Makefile.am | 164 |
7 files changed, 369 insertions, 369 deletions
diff --git a/configure.ac b/configure.ac index 374f00cab..92130c6e4 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -402,14 +402,14 @@ else | |||
402 | fi | 402 | fi |
403 | 403 | ||
404 | 404 | ||
405 | # libcurl | 405 | # libgnurl |
406 | LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0) | 406 | LIBGNURL_CHECK_CONFIG(,7.33.0,gnurl=1,gnurl=0) |
407 | if test "$curl" = 1 | 407 | if test "$gnurl" = 1 |
408 | then | 408 | then |
409 | AM_CONDITIONAL(HAVE_LIBCURL, true) | 409 | AM_CONDITIONAL(HAVE_LIBGNURL, true) |
410 | AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl]) | 410 | AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) |
411 | else | 411 | else |
412 | AM_CONDITIONAL(HAVE_LIBCURL, false) | 412 | AM_CONDITIONAL(HAVE_LIBGNURL, false) |
413 | fi | 413 | fi |
414 | 414 | ||
415 | 415 | ||
@@ -1462,10 +1462,10 @@ then | |||
1462 | AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.]) | 1462 | AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.]) |
1463 | fi | 1463 | fi |
1464 | 1464 | ||
1465 | # libcurl | 1465 | # libgnurl |
1466 | if test "x$curl" = "x0" | 1466 | if test "x$gnurl" = "x0" |
1467 | then | 1467 | then |
1468 | AC_MSG_NOTICE([NOTICE: libcurl not found. http client support will not be compiled.]) | 1468 | AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) |
1469 | fi | 1469 | fi |
1470 | 1470 | ||
1471 | # bluetooth | 1471 | # bluetooth |
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 deleted file mode 100644 index 01a0575cc..000000000 --- a/m4/libcurl.m4 +++ /dev/null | |||
@@ -1,250 +0,0 @@ | |||
1 | # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], | ||
2 | # [ACTION-IF-YES], [ACTION-IF-NO]) | ||
3 | # ---------------------------------------------------------- | ||
4 | # David Shaw <dshaw@jabberwocky.com> May-09-2006 | ||
5 | # | ||
6 | # Checks for libcurl. DEFAULT-ACTION is the string yes or no to | ||
7 | # specify whether to default to --with-libcurl or --without-libcurl. | ||
8 | # If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the | ||
9 | # minimum version of libcurl to accept. Pass the version as a regular | ||
10 | # version number like 7.10.1. If not supplied, any version is | ||
11 | # accepted. ACTION-IF-YES is a list of shell commands to run if | ||
12 | # libcurl was successfully found and passed the various tests. | ||
13 | # ACTION-IF-NO is a list of shell commands that are run otherwise. | ||
14 | # Note that using --without-libcurl does run ACTION-IF-NO. | ||
15 | # | ||
16 | # This macro #defines HAVE_LIBCURL if a working libcurl setup is | ||
17 | # found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary | ||
18 | # values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are | ||
19 | # the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy | ||
20 | # where yyy are the various protocols supported by libcurl. Both xxx | ||
21 | # and yyy are capitalized. See the list of AH_TEMPLATEs at the top of | ||
22 | # the macro for the complete list of possible defines. Shell | ||
23 | # variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also | ||
24 | # defined to 'yes' for those features and protocols that were found. | ||
25 | # Note that xxx and yyy keep the same capitalization as in the | ||
26 | # curl-config list (e.g. it's "HTTP" and not "http"). | ||
27 | # | ||
28 | # Users may override the detected values by doing something like: | ||
29 | # LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure | ||
30 | # | ||
31 | # For the sake of sanity, this macro assumes that any libcurl that is | ||
32 | # found is after version 7.7.2, the first version that included the | ||
33 | # curl-config script. Note that it is very important for people | ||
34 | # packaging binary versions of libcurl to include this script! | ||
35 | # Without curl-config, we can only guess what protocols are available, | ||
36 | # or use curl_version_info to figure it out at runtime. | ||
37 | |||
38 | AC_DEFUN([LIBCURL_CHECK_CONFIG], | ||
39 | [ | ||
40 | AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL]) | ||
41 | AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4]) | ||
42 | AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6]) | ||
43 | AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz]) | ||
44 | AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS]) | ||
45 | AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN]) | ||
46 | AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI]) | ||
47 | AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM]) | ||
48 | |||
49 | AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP]) | ||
50 | AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) | ||
51 | AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) | ||
52 | AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) | ||
53 | AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) | ||
54 | AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) | ||
55 | AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) | ||
56 | AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) | ||
57 | AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP]) | ||
58 | AH_TEMPLATE([LIBCURL_PROTOCOL_RTSP],[Defined if libcurl supports RTSP]) | ||
59 | AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3]) | ||
60 | AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP]) | ||
61 | AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) | ||
62 | |||
63 | AC_ARG_WITH(libcurl, | ||
64 | AC_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])]) | ||
66 | |||
67 | if test "$_libcurl_with" != "no" ; then | ||
68 | |||
69 | AC_PROG_AWK | ||
70 | |||
71 | _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" | ||
72 | |||
73 | _libcurl_try_link=yes | ||
74 | |||
75 | if test -d "$_libcurl_with" ; then | ||
76 | LIBCURL_CPPFLAGS="-I$withval/include" | ||
77 | _libcurl_ldflags="-L$withval/lib" | ||
78 | AC_PATH_PROG([_libcurl_config],[curl-config],[], | ||
79 | ["$withval/bin"]) | ||
80 | else | ||
81 | AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH]) | ||
82 | fi | ||
83 | |||
84 | if test x$_libcurl_config != "x" ; then | ||
85 | AC_CACHE_CHECK([for the version of libcurl], | ||
86 | [libcurl_cv_lib_curl_version], | ||
87 | [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) | ||
88 | |||
89 | _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` | ||
90 | _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` | ||
91 | |||
92 | if test $_libcurl_wanted -gt 0 ; then | ||
93 | AC_CACHE_CHECK([for libcurl >= version $2], | ||
94 | [libcurl_cv_lib_version_ok], | ||
95 | [ | ||
96 | if test $_libcurl_version -ge $_libcurl_wanted ; then | ||
97 | libcurl_cv_lib_version_ok=yes | ||
98 | else | ||
99 | libcurl_cv_lib_version_ok=no | ||
100 | fi | ||
101 | ]) | ||
102 | fi | ||
103 | |||
104 | if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then | ||
105 | if test x"$LIBCURL_CPPFLAGS" = "x" ; then | ||
106 | LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` | ||
107 | fi | ||
108 | if test x"$LIBCURL" = "x" ; then | ||
109 | LIBCURL=`$_libcurl_config --libs` | ||
110 | |||
111 | # This is so silly, but Apple actually has a bug in their | ||
112 | # curl-config script. Fixed in Tiger, but there are still | ||
113 | # lots of Panther installs around. | ||
114 | case "${host}" in | ||
115 | powerpc-apple-darwin7*) | ||
116 | LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` | ||
117 | ;; | ||
118 | esac | ||
119 | fi | ||
120 | |||
121 | # All curl-config scripts support --feature | ||
122 | _libcurl_features=`$_libcurl_config --feature` | ||
123 | |||
124 | # Is it modern enough to have --protocols? (7.12.4) | ||
125 | if test $_libcurl_version -ge 461828 ; then | ||
126 | _libcurl_protocols=`$_libcurl_config --protocols` | ||
127 | fi | ||
128 | else | ||
129 | _libcurl_try_link=no | ||
130 | fi | ||
131 | |||
132 | unset _libcurl_wanted | ||
133 | fi | ||
134 | |||
135 | if test $_libcurl_try_link = yes ; then | ||
136 | |||
137 | # we didn't find curl-config, so let's see if the user-supplied | ||
138 | # link line (or failing that, "-lcurl") is enough. | ||
139 | LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"} | ||
140 | |||
141 | AC_CACHE_CHECK([whether libcurl is usable], | ||
142 | [libcurl_cv_lib_curl_usable], | ||
143 | [ | ||
144 | _libcurl_save_cppflags=$CPPFLAGS | ||
145 | CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS" | ||
146 | _libcurl_save_libs=$LIBS | ||
147 | LIBS="$LIBCURL $LIBS" | ||
148 | |||
149 | AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[ | ||
150 | /* Try and use a few common options to force a failure if we are | ||
151 | missing symbols or can't link. */ | ||
152 | int x; | ||
153 | curl_easy_setopt(NULL,CURLOPT_URL,NULL); | ||
154 | x=CURL_ERROR_SIZE; | ||
155 | x=CURLOPT_WRITEFUNCTION; | ||
156 | x=CURLOPT_FILE; | ||
157 | x=CURLOPT_ERRORBUFFER; | ||
158 | x=CURLOPT_STDERR; | ||
159 | x=CURLOPT_VERBOSE; | ||
160 | ])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) | ||
161 | |||
162 | CPPFLAGS=$_libcurl_save_cppflags | ||
163 | LIBS=$_libcurl_save_libs | ||
164 | unset _libcurl_save_cppflags | ||
165 | unset _libcurl_save_libs | ||
166 | ]) | ||
167 | |||
168 | if test $libcurl_cv_lib_curl_usable = yes ; then | ||
169 | |||
170 | # Does curl_free() exist in this version of libcurl? | ||
171 | # If not, fake it with free() | ||
172 | |||
173 | _libcurl_save_cppflags=$CPPFLAGS | ||
174 | CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" | ||
175 | _libcurl_save_libs=$LIBS | ||
176 | LIBS="$LIBS $LIBCURL" | ||
177 | |||
178 | AC_CHECK_FUNC(curl_free,, | ||
179 | AC_DEFINE(curl_free,free, | ||
180 | [Define curl_free() as free() if our version of curl lacks curl_free.])) | ||
181 | |||
182 | CPPFLAGS=$_libcurl_save_cppflags | ||
183 | LIBS=$_libcurl_save_libs | ||
184 | unset _libcurl_save_cppflags | ||
185 | unset _libcurl_save_libs | ||
186 | |||
187 | AC_DEFINE(HAVE_LIBCURL,1, | ||
188 | [Define to 1 if you have a functional curl library.]) | ||
189 | AC_SUBST(LIBCURL_CPPFLAGS) | ||
190 | AC_SUBST(LIBCURL) | ||
191 | |||
192 | for _libcurl_feature in $_libcurl_features ; do | ||
193 | AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1]) | ||
194 | eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes | ||
195 | done | ||
196 | |||
197 | if test "x$_libcurl_protocols" = "x" ; then | ||
198 | |||
199 | # We don't have --protocols, so just assume that all | ||
200 | # protocols are available | ||
201 | _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" | ||
202 | |||
203 | if test x$libcurl_feature_SSL = xyes ; then | ||
204 | _libcurl_protocols="$_libcurl_protocols HTTPS" | ||
205 | |||
206 | # FTPS wasn't standards-compliant until version | ||
207 | # 7.11.0 (0x070b00 == 461568) | ||
208 | if test $_libcurl_version -ge 461568; then | ||
209 | _libcurl_protocols="$_libcurl_protocols FTPS" | ||
210 | fi | ||
211 | fi | ||
212 | |||
213 | # RTSP, IMAP, POP3 and SMTP were added in | ||
214 | # 7.20.0 (0x071400 == 463872) | ||
215 | if test $_libcurl_version -ge 463872; then | ||
216 | _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP" | ||
217 | fi | ||
218 | fi | ||
219 | |||
220 | for _libcurl_protocol in $_libcurl_protocols ; do | ||
221 | AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) | ||
222 | eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes | ||
223 | done | ||
224 | else | ||
225 | unset LIBCURL | ||
226 | unset LIBCURL_CPPFLAGS | ||
227 | fi | ||
228 | fi | ||
229 | |||
230 | unset _libcurl_try_link | ||
231 | unset _libcurl_version_parse | ||
232 | unset _libcurl_config | ||
233 | unset _libcurl_feature | ||
234 | unset _libcurl_features | ||
235 | unset _libcurl_protocol | ||
236 | unset _libcurl_protocols | ||
237 | unset _libcurl_version | ||
238 | unset _libcurl_ldflags | ||
239 | fi | ||
240 | |||
241 | if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then | ||
242 | # This is the IF-NO path | ||
243 | ifelse([$4],,:,[$4]) | ||
244 | else | ||
245 | # This is the IF-YES path | ||
246 | ifelse([$3],,:,[$3]) | ||
247 | fi | ||
248 | |||
249 | unset _libcurl_with | ||
250 | ])dnl | ||
diff --git a/m4/libgnurl.m4 b/m4/libgnurl.m4 new file mode 100644 index 000000000..1cb3f2e2b --- /dev/null +++ b/m4/libgnurl.m4 | |||
@@ -0,0 +1,250 @@ | |||
1 | # LIBGNURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], | ||
2 | # [ACTION-IF-YES], [ACTION-IF-NO]) | ||
3 | # ---------------------------------------------------------- | ||
4 | # David Shaw <dshaw@jabberwocky.com> May-09-2006 | ||
5 | # | ||
6 | # Checks for libgnurl. DEFAULT-ACTION is the string yes or no to | ||
7 | # specify whether to default to --with-libgnurl or --without-libgnurl. | ||
8 | # If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the | ||
9 | # minimum version of libgnurl to accept. Pass the version as a regular | ||
10 | # version number like 7.10.1. If not supplied, any version is | ||
11 | # accepted. ACTION-IF-YES is a list of shell commands to run if | ||
12 | # libgnurl was successfully found and passed the various tests. | ||
13 | # ACTION-IF-NO is a list of shell commands that are run otherwise. | ||
14 | # Note that using --without-libgnurl does run ACTION-IF-NO. | ||
15 | # | ||
16 | # This macro #defines HAVE_LIBGNURL if a working libgnurl setup is | ||
17 | # found, and sets @LIBGNURL@ and @LIBGNURL_CPPFLAGS@ to the necessary | ||
18 | # values. Other useful defines are LIBGNURL_FEATURE_xxx where xxx are | ||
19 | # the various features supported by libgnurl, and LIBGNURL_PROTOCOL_yyy | ||
20 | # where yyy are the various protocols supported by libgnurl. Both xxx | ||
21 | # and yyy are capitalized. See the list of AH_TEMPLATEs at the top of | ||
22 | # the macro for the complete list of possible defines. Shell | ||
23 | # variables $libgnurl_feature_xxx and $libgnurl_protocol_yyy are also | ||
24 | # defined to 'yes' for those features and protocols that were found. | ||
25 | # Note that xxx and yyy keep the same capitalization as in the | ||
26 | # gnurl-config list (e.g. it's "HTTP" and not "http"). | ||
27 | # | ||
28 | # Users may override the detected values by doing something like: | ||
29 | # LIBGNURL="-lgnurl" LIBGNURL_CPPFLAGS="-I/usr/myinclude" ./configure | ||
30 | # | ||
31 | # For the sake of sanity, this macro assumes that any libgnurl that is | ||
32 | # found is after version 7.7.2, the first version that included the | ||
33 | # gnurl-config script. Note that it is very important for people | ||
34 | # packaging binary versions of libgnurl to include this script! | ||
35 | # Without gnurl-config, we can only guess what protocols are available, | ||
36 | # or use gnurl_version_info to figure it out at runtime. | ||
37 | |||
38 | AC_DEFUN([LIBGNURL_CHECK_CONFIG], | ||
39 | [ | ||
40 | AH_TEMPLATE([LIBGNURL_FEATURE_SSL],[Defined if libgnurl supports SSL]) | ||
41 | AH_TEMPLATE([LIBGNURL_FEATURE_KRB4],[Defined if libgnurl supports KRB4]) | ||
42 | AH_TEMPLATE([LIBGNURL_FEATURE_IPV6],[Defined if libgnurl supports IPv6]) | ||
43 | AH_TEMPLATE([LIBGNURL_FEATURE_LIBZ],[Defined if libgnurl supports libz]) | ||
44 | AH_TEMPLATE([LIBGNURL_FEATURE_ASYNCHDNS],[Defined if libgnurl supports AsynchDNS]) | ||
45 | AH_TEMPLATE([LIBGNURL_FEATURE_IDN],[Defined if libgnurl supports IDN]) | ||
46 | AH_TEMPLATE([LIBGNURL_FEATURE_SSPI],[Defined if libgnurl supports SSPI]) | ||
47 | AH_TEMPLATE([LIBGNURL_FEATURE_NTLM],[Defined if libgnurl supports NTLM]) | ||
48 | |||
49 | AH_TEMPLATE([LIBGNURL_PROTOCOL_HTTP],[Defined if libgnurl supports HTTP]) | ||
50 | AH_TEMPLATE([LIBGNURL_PROTOCOL_HTTPS],[Defined if libgnurl supports HTTPS]) | ||
51 | AH_TEMPLATE([LIBGNURL_PROTOCOL_FTP],[Defined if libgnurl supports FTP]) | ||
52 | AH_TEMPLATE([LIBGNURL_PROTOCOL_FTPS],[Defined if libgnurl supports FTPS]) | ||
53 | AH_TEMPLATE([LIBGNURL_PROTOCOL_FILE],[Defined if libgnurl supports FILE]) | ||
54 | AH_TEMPLATE([LIBGNURL_PROTOCOL_TELNET],[Defined if libgnurl supports TELNET]) | ||
55 | AH_TEMPLATE([LIBGNURL_PROTOCOL_LDAP],[Defined if libgnurl supports LDAP]) | ||
56 | AH_TEMPLATE([LIBGNURL_PROTOCOL_DICT],[Defined if libgnurl supports DICT]) | ||
57 | AH_TEMPLATE([LIBGNURL_PROTOCOL_TFTP],[Defined if libgnurl supports TFTP]) | ||
58 | AH_TEMPLATE([LIBGNURL_PROTOCOL_RTSP],[Defined if libgnurl supports RTSP]) | ||
59 | AH_TEMPLATE([LIBGNURL_PROTOCOL_POP3],[Defined if libgnurl supports POP3]) | ||
60 | AH_TEMPLATE([LIBGNURL_PROTOCOL_IMAP],[Defined if libgnurl supports IMAP]) | ||
61 | AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP]) | ||
62 | |||
63 | AC_ARG_WITH(libgnurl, | ||
64 | AC_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]), | ||
65 | [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])]) | ||
66 | |||
67 | if test "$_libgnurl_with" != "no" ; then | ||
68 | |||
69 | AC_PROG_AWK | ||
70 | |||
71 | _libgnurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" | ||
72 | |||
73 | _libgnurl_try_link=yes | ||
74 | |||
75 | if test -d "$_libgnurl_with" ; then | ||
76 | LIBGNURL_CPPFLAGS="-I$withval/include" | ||
77 | _libgnurl_ldflags="-L$withval/lib" | ||
78 | AC_PATH_PROG([_libgnurl_config],[gnurl-config],[], | ||
79 | ["$withval/bin"]) | ||
80 | else | ||
81 | AC_PATH_PROG([_libgnurl_config],[gnurl-config],[],[$PATH]) | ||
82 | fi | ||
83 | |||
84 | if test x$_libgnurl_config != "x" ; then | ||
85 | AC_CACHE_CHECK([for the version of libgnurl], | ||
86 | [libgnurl_cv_lib_gnurl_version], | ||
87 | [libgnurl_cv_lib_gnurl_version=`$_libgnurl_config --version | $AWK '{print $[]2}'`]) | ||
88 | |||
89 | _libgnurl_version=`echo $libgnurl_cv_lib_gnurl_version | $_libgnurl_version_parse` | ||
90 | _libgnurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libgnurl_version_parse` | ||
91 | |||
92 | if test $_libgnurl_wanted -gt 0 ; then | ||
93 | AC_CACHE_CHECK([for libgnurl >= version $2], | ||
94 | [libgnurl_cv_lib_version_ok], | ||
95 | [ | ||
96 | if test $_libgnurl_version -ge $_libgnurl_wanted ; then | ||
97 | libgnurl_cv_lib_version_ok=yes | ||
98 | else | ||
99 | libgnurl_cv_lib_version_ok=no | ||
100 | fi | ||
101 | ]) | ||
102 | fi | ||
103 | |||
104 | if test $_libgnurl_wanted -eq 0 || test x$libgnurl_cv_lib_version_ok = xyes ; then | ||
105 | if test x"$LIBGNURL_CPPFLAGS" = "x" ; then | ||
106 | LIBGNURL_CPPFLAGS=`$_libgnurl_config --cflags` | ||
107 | fi | ||
108 | if test x"$LIBGNURL" = "x" ; then | ||
109 | LIBGNURL=`$_libgnurl_config --libs` | ||
110 | |||
111 | # This is so silly, but Apple actually has a bug in their | ||
112 | # gnurl-config script. Fixed in Tiger, but there are still | ||
113 | # lots of Panther installs around. | ||
114 | case "${host}" in | ||
115 | powerpc-apple-darwin7*) | ||
116 | LIBGNURL=`echo $LIBGNURL | sed -e 's|-arch i386||g'` | ||
117 | ;; | ||
118 | esac | ||
119 | fi | ||
120 | |||
121 | # All gnurl-config scripts support --feature | ||
122 | _libgnurl_features=`$_libgnurl_config --feature` | ||
123 | |||
124 | # Is it modern enough to have --protocols? (7.12.4) | ||
125 | if test $_libgnurl_version -ge 461828 ; then | ||
126 | _libgnurl_protocols=`$_libgnurl_config --protocols` | ||
127 | fi | ||
128 | else | ||
129 | _libgnurl_try_link=no | ||
130 | fi | ||
131 | |||
132 | unset _libgnurl_wanted | ||
133 | fi | ||
134 | |||
135 | if test $_libgnurl_try_link = yes ; then | ||
136 | |||
137 | # we didn't find gnurl-config, so let's see if the user-supplied | ||
138 | # link line (or failing that, "-lgnurl") is enough. | ||
139 | LIBGNURL=${LIBGNURL-"$_libgnurl_ldflags -lgnurl"} | ||
140 | |||
141 | AC_CACHE_CHECK([whether libgnurl is usable], | ||
142 | [libgnurl_cv_lib_gnurl_usable], | ||
143 | [ | ||
144 | _libgnurl_save_cppflags=$CPPFLAGS | ||
145 | CPPFLAGS="$LIBGNURL_CPPFLAGS $CPPFLAGS" | ||
146 | _libgnurl_save_libs=$LIBS | ||
147 | LIBS="$LIBGNURL $LIBS" | ||
148 | |||
149 | AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[ | ||
150 | /* Try and use a few common options to force a failure if we are | ||
151 | missing symbols or can't link. */ | ||
152 | int x; | ||
153 | gnurl_easy_setopt(NULL,GNURLOPT_URL,NULL); | ||
154 | x=GNURL_ERROR_SIZE; | ||
155 | x=GNURLOPT_WRITEFUNCTION; | ||
156 | x=GNURLOPT_FILE; | ||
157 | x=GNURLOPT_ERRORBUFFER; | ||
158 | x=GNURLOPT_STDERR; | ||
159 | x=GNURLOPT_VERBOSE; | ||
160 | ])],libgnurl_cv_lib_gnurl_usable=yes,libgnurl_cv_lib_gnurl_usable=no) | ||
161 | |||
162 | CPPFLAGS=$_libgnurl_save_cppflags | ||
163 | LIBS=$_libgnurl_save_libs | ||
164 | unset _libgnurl_save_cppflags | ||
165 | unset _libgnurl_save_libs | ||
166 | ]) | ||
167 | |||
168 | if test $libgnurl_cv_lib_gnurl_usable = yes ; then | ||
169 | |||
170 | # Does gnurl_free() exist in this version of libgnurl? | ||
171 | # If not, fake it with free() | ||
172 | |||
173 | _libgnurl_save_cppflags=$CPPFLAGS | ||
174 | CPPFLAGS="$CPPFLAGS $LIBGNURL_CPPFLAGS" | ||
175 | _libgnurl_save_libs=$LIBS | ||
176 | LIBS="$LIBS $LIBGNURL" | ||
177 | |||
178 | AC_CHECK_FUNC(gnurl_free,, | ||
179 | AC_DEFINE(gnurl_free,free, | ||
180 | [Define gnurl_free() as free() if our version of gnurl lacks gnurl_free.])) | ||
181 | |||
182 | CPPFLAGS=$_libgnurl_save_cppflags | ||
183 | LIBS=$_libgnurl_save_libs | ||
184 | unset _libgnurl_save_cppflags | ||
185 | unset _libgnurl_save_libs | ||
186 | |||
187 | AC_DEFINE(HAVE_LIBGNURL,1, | ||
188 | [Define to 1 if you have a functional gnurl library.]) | ||
189 | AC_SUBST(LIBGNURL_CPPFLAGS) | ||
190 | AC_SUBST(LIBGNURL) | ||
191 | |||
192 | for _libgnurl_feature in $_libgnurl_features ; do | ||
193 | AC_DEFINE_UNQUOTED(AS_TR_CPP(libgnurl_feature_$_libgnurl_feature),[1]) | ||
194 | eval AS_TR_SH(libgnurl_feature_$_libgnurl_feature)=yes | ||
195 | done | ||
196 | |||
197 | if test "x$_libgnurl_protocols" = "x" ; then | ||
198 | |||
199 | # We don't have --protocols, so just assume that all | ||
200 | # protocols are available | ||
201 | _libgnurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" | ||
202 | |||
203 | if test x$libgnurl_feature_SSL = xyes ; then | ||
204 | _libgnurl_protocols="$_libgnurl_protocols HTTPS" | ||
205 | |||
206 | # FTPS wasn't standards-compliant until version | ||
207 | # 7.11.0 (0x070b00 == 461568) | ||
208 | if test $_libgnurl_version -ge 461568; then | ||
209 | _libgnurl_protocols="$_libgnurl_protocols FTPS" | ||
210 | fi | ||
211 | fi | ||
212 | |||
213 | # RTSP, IMAP, POP3 and SMTP were added in | ||
214 | # 7.20.0 (0x071400 == 463872) | ||
215 | if test $_libgnurl_version -ge 463872; then | ||
216 | _libgnurl_protocols="$_libgnurl_protocols RTSP IMAP POP3 SMTP" | ||
217 | fi | ||
218 | fi | ||
219 | |||
220 | for _libgnurl_protocol in $_libgnurl_protocols ; do | ||
221 | AC_DEFINE_UNQUOTED(AS_TR_CPP(libgnurl_protocol_$_libgnurl_protocol),[1]) | ||
222 | eval AS_TR_SH(libgnurl_protocol_$_libgnurl_protocol)=yes | ||
223 | done | ||
224 | else | ||
225 | unset LIBGNURL | ||
226 | unset LIBGNURL_CPPFLAGS | ||
227 | fi | ||
228 | fi | ||
229 | |||
230 | unset _libgnurl_try_link | ||
231 | unset _libgnurl_version_parse | ||
232 | unset _libgnurl_config | ||
233 | unset _libgnurl_feature | ||
234 | unset _libgnurl_features | ||
235 | unset _libgnurl_protocol | ||
236 | unset _libgnurl_protocols | ||
237 | unset _libgnurl_version | ||
238 | unset _libgnurl_ldflags | ||
239 | fi | ||
240 | |||
241 | if test x$_libgnurl_with = xno || test x$libgnurl_cv_lib_gnurl_usable != xyes ; then | ||
242 | # This is the IF-NO path | ||
243 | ifelse([$4],,:,[$4]) | ||
244 | else | ||
245 | # This is the IF-YES path | ||
246 | ifelse([$3],,:,[$3]) | ||
247 | fi | ||
248 | |||
249 | unset _libgnurl_with | ||
250 | ])dnl | ||
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index d97a4b48c..75c3d0133 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -49,7 +49,7 @@ lib_LTLIBRARIES = \ | |||
49 | 49 | ||
50 | if HAVE_MHD | 50 | if HAVE_MHD |
51 | if HAVE_GNUTLS | 51 | if HAVE_GNUTLS |
52 | if HAVE_LIBCURL | 52 | if HAVE_LIBGNURL |
53 | # DO_PROXY=gnunet-gns-proxy | 53 | # DO_PROXY=gnunet-gns-proxy |
54 | endif | 54 | endif |
55 | endif | 55 | endif |
@@ -119,7 +119,7 @@ gnunet_dns2gns_DEPENDENCIES = \ | |||
119 | 119 | ||
120 | gnunet_gns_proxy_SOURCES = \ | 120 | gnunet_gns_proxy_SOURCES = \ |
121 | gnunet-gns-proxy.c | 121 | gnunet-gns-proxy.c |
122 | gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \ | 122 | gnunet_gns_proxy_LDADD = -lmicrohttpd -lgnurl -lgnutls \ |
123 | $(top_builddir)/src/gns/libgnunetgns.la \ | 123 | $(top_builddir)/src/gns/libgnunetgns.la \ |
124 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 124 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
125 | $(top_builddir)/src/util/libgnunetutil.la \ | 125 | $(top_builddir)/src/util/libgnunetutil.la \ |
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 38c065cbf..c31f28c26 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -12,11 +12,11 @@ if USE_COVERAGE | |||
12 | endif | 12 | endif |
13 | 13 | ||
14 | if HAVE_MHD | 14 | if HAVE_MHD |
15 | HOSTLIST_SERVER_SOURCES = hostlist-server.c hostlist-server.h | 15 | HOSTLIST_SERVER_SOURCES = hostlist-server.c hostlist-server.h |
16 | GN_LIBMHD = -lmicrohttpd | 16 | GN_LIBMHD = -lmicrohttpd |
17 | endif | 17 | endif |
18 | 18 | ||
19 | if HAVE_LIBCURL | 19 | if HAVE_LIBGNURL |
20 | libexec_PROGRAMS = \ | 20 | libexec_PROGRAMS = \ |
21 | gnunet-daemon-hostlist | 21 | gnunet-daemon-hostlist |
22 | endif | 22 | endif |
@@ -34,13 +34,13 @@ gnunet_daemon_hostlist_LDADD = \ | |||
34 | $(top_builddir)/src/transport/libgnunettransport.la \ | 34 | $(top_builddir)/src/transport/libgnunettransport.la \ |
35 | $(top_builddir)/src/util/libgnunetutil.la \ | 35 | $(top_builddir)/src/util/libgnunetutil.la \ |
36 | $(GN_LIBMHD) \ | 36 | $(GN_LIBMHD) \ |
37 | @LIBCURL@ \ | 37 | @LIBGNURL@ \ |
38 | $(GN_LIBINTL) | 38 | $(GN_LIBINTL) |
39 | 39 | ||
40 | gnunet_daemon_hostlist_CPPFLAGS = \ | 40 | gnunet_daemon_hostlist_CPPFLAGS = \ |
41 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 41 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
42 | 42 | ||
43 | if HAVE_LIBCURL | 43 | if HAVE_LIBGNURL |
44 | check_PROGRAMS = \ | 44 | check_PROGRAMS = \ |
45 | test_gnunet_daemon_hostlist \ | 45 | test_gnunet_daemon_hostlist \ |
46 | test_gnunet_daemon_hostlist_reconnect \ | 46 | test_gnunet_daemon_hostlist_reconnect \ |
@@ -60,13 +60,13 @@ test_gnunet_daemon_hostlist_SOURCES = \ | |||
60 | test_gnunet_daemon_hostlist.c | 60 | test_gnunet_daemon_hostlist.c |
61 | test_gnunet_daemon_hostlist_LDADD = \ | 61 | test_gnunet_daemon_hostlist_LDADD = \ |
62 | $(top_builddir)/src/transport/libgnunettransport.la \ | 62 | $(top_builddir)/src/transport/libgnunettransport.la \ |
63 | $(top_builddir)/src/util/libgnunetutil.la | 63 | $(top_builddir)/src/util/libgnunetutil.la |
64 | 64 | ||
65 | test_gnunet_daemon_hostlist_reconnect_SOURCES = \ | 65 | test_gnunet_daemon_hostlist_reconnect_SOURCES = \ |
66 | test_gnunet_daemon_hostlist_reconnect.c | 66 | test_gnunet_daemon_hostlist_reconnect.c |
67 | test_gnunet_daemon_hostlist_reconnect_LDADD = \ | 67 | test_gnunet_daemon_hostlist_reconnect_LDADD = \ |
68 | $(top_builddir)/src/transport/libgnunettransport.la \ | 68 | $(top_builddir)/src/transport/libgnunettransport.la \ |
69 | $(top_builddir)/src/util/libgnunetutil.la | 69 | $(top_builddir)/src/util/libgnunetutil.la |
70 | 70 | ||
71 | test_gnunet_daemon_hostlist_learning_SOURCES = \ | 71 | test_gnunet_daemon_hostlist_learning_SOURCES = \ |
72 | test_gnunet_daemon_hostlist_learning.c | 72 | test_gnunet_daemon_hostlist_learning.c |
@@ -74,7 +74,7 @@ test_gnunet_daemon_hostlist_learning_LDADD = \ | |||
74 | $(top_builddir)/src/transport/libgnunettransport.la \ | 74 | $(top_builddir)/src/transport/libgnunettransport.la \ |
75 | $(top_builddir)/src/core/libgnunetcore.la \ | 75 | $(top_builddir)/src/core/libgnunetcore.la \ |
76 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 76 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
77 | $(top_builddir)/src/util/libgnunetutil.la | 77 | $(top_builddir)/src/util/libgnunetutil.la |
78 | 78 | ||
79 | EXTRA_DIST = \ | 79 | EXTRA_DIST = \ |
80 | test_hostlist_defaults.conf \ | 80 | test_hostlist_defaults.conf \ |
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index aff43b2ef..76d5d8c80 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -18,10 +18,10 @@ dist_pkgcfg_DATA = \ | |||
18 | pt.conf | 18 | pt.conf |
19 | 19 | ||
20 | libexec_PROGRAMS = \ | 20 | libexec_PROGRAMS = \ |
21 | gnunet-daemon-pt | 21 | gnunet-daemon-pt |
22 | 22 | ||
23 | gnunet_daemon_pt_SOURCES = \ | 23 | gnunet_daemon_pt_SOURCES = \ |
24 | gnunet-daemon-pt.c | 24 | gnunet-daemon-pt.c |
25 | gnunet_daemon_pt_LDADD = \ | 25 | gnunet_daemon_pt_LDADD = \ |
26 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 26 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
27 | $(top_builddir)/src/mesh/libgnunetmesh.la \ | 27 | $(top_builddir)/src/mesh/libgnunetmesh.la \ |
@@ -34,7 +34,7 @@ gnunet_daemon_pt_LDADD = \ | |||
34 | 34 | ||
35 | if HAVE_TESTING | 35 | if HAVE_TESTING |
36 | if HAVE_MHD | 36 | if HAVE_MHD |
37 | if HAVE_LIBCURL | 37 | if HAVE_LIBGNURL |
38 | if LINUX | 38 | if LINUX |
39 | VPN_TEST = \ | 39 | VPN_TEST = \ |
40 | test_gnunet_vpn-4_to_6 \ | 40 | test_gnunet_vpn-4_to_6 \ |
@@ -48,7 +48,7 @@ if MINGW | |||
48 | test_gnunet_vpn-4_to_6 \ | 48 | test_gnunet_vpn-4_to_6 \ |
49 | test_gnunet_vpn-6_to_4 \ | 49 | test_gnunet_vpn-6_to_4 \ |
50 | test_gnunet_vpn-6_over \ | 50 | test_gnunet_vpn-6_over \ |
51 | test_gnunet_vpn-4_over | 51 | test_gnunet_vpn-4_over |
52 | endif | 52 | endif |
53 | endif | 53 | endif |
54 | endif | 54 | endif |
@@ -68,47 +68,47 @@ EXTRA_DIST = \ | |||
68 | 68 | ||
69 | test_gns_vpn_SOURCES = \ | 69 | test_gns_vpn_SOURCES = \ |
70 | test_gns_vpn.c | 70 | test_gns_vpn.c |
71 | test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \ | 71 | test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ |
72 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 72 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
73 | $(top_builddir)/src/testing/libgnunettesting.la \ | 73 | $(top_builddir)/src/testing/libgnunettesting.la \ |
74 | $(top_builddir)/src/util/libgnunetutil.la | 74 | $(top_builddir)/src/util/libgnunetutil.la |
75 | test_gns_vpn_CPPFLAGS = \ | 75 | test_gns_vpn_CPPFLAGS = \ |
76 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 76 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
77 | 77 | ||
78 | test_gnunet_vpn_4_over_SOURCES = \ | 78 | test_gnunet_vpn_4_over_SOURCES = \ |
79 | test_gnunet_vpn.c | 79 | test_gnunet_vpn.c |
80 | test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \ | 80 | test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ |
81 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 81 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
82 | $(top_builddir)/src/testing/libgnunettesting.la \ | 82 | $(top_builddir)/src/testing/libgnunettesting.la \ |
83 | $(top_builddir)/src/util/libgnunetutil.la | 83 | $(top_builddir)/src/util/libgnunetutil.la |
84 | test_gnunet_vpn_4_over_CPPFLAGS = \ | 84 | test_gnunet_vpn_4_over_CPPFLAGS = \ |
85 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 85 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
86 | 86 | ||
87 | test_gnunet_vpn_6_over_SOURCES = \ | 87 | test_gnunet_vpn_6_over_SOURCES = \ |
88 | test_gnunet_vpn.c | 88 | test_gnunet_vpn.c |
89 | test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \ | 89 | test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ |
90 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 90 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
91 | $(top_builddir)/src/testing/libgnunettesting.la \ | 91 | $(top_builddir)/src/testing/libgnunettesting.la \ |
92 | $(top_builddir)/src/util/libgnunetutil.la | 92 | $(top_builddir)/src/util/libgnunetutil.la |
93 | test_gnunet_vpn_6_over_CPPFLAGS = \ | 93 | test_gnunet_vpn_6_over_CPPFLAGS = \ |
94 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 94 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
95 | 95 | ||
96 | test_gnunet_vpn_4_to_6_SOURCES = \ | 96 | test_gnunet_vpn_4_to_6_SOURCES = \ |
97 | test_gnunet_vpn.c | 97 | test_gnunet_vpn.c |
98 | test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \ | 98 | test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ |
99 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 99 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
100 | $(top_builddir)/src/testing/libgnunettesting.la \ | 100 | $(top_builddir)/src/testing/libgnunettesting.la \ |
101 | $(top_builddir)/src/util/libgnunetutil.la | 101 | $(top_builddir)/src/util/libgnunetutil.la |
102 | test_gnunet_vpn_4_to_6_CPPFLAGS = \ | 102 | test_gnunet_vpn_4_to_6_CPPFLAGS = \ |
103 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 103 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
104 | 104 | ||
105 | test_gnunet_vpn_6_to_4_SOURCES = \ | 105 | test_gnunet_vpn_6_to_4_SOURCES = \ |
106 | test_gnunet_vpn.c | 106 | test_gnunet_vpn.c |
107 | test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \ | 107 | test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ |
108 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 108 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
109 | $(top_builddir)/src/testing/libgnunettesting.la \ | 109 | $(top_builddir)/src/testing/libgnunettesting.la \ |
110 | $(top_builddir)/src/util/libgnunetutil.la | 110 | $(top_builddir)/src/util/libgnunetutil.la |
111 | test_gnunet_vpn_6_to_4_CPPFLAGS = \ | 111 | test_gnunet_vpn_6_to_4_CPPFLAGS = \ |
112 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 112 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
113 | 113 | ||
114 | 114 | ||
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 212ad2ba9..bb30e4cea 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -18,15 +18,15 @@ if HAVE_MHD | |||
18 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server | 18 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server |
19 | endif | 19 | endif |
20 | 20 | ||
21 | if HAVE_LIBCURL | 21 | if HAVE_LIBGNURL |
22 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client | 22 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client |
23 | HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client | 23 | HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client |
24 | HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la | 24 | HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la |
25 | HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la | 25 | HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la |
26 | endif | 26 | endif |
27 | 27 | ||
28 | if HAVE_MHD | 28 | if HAVE_MHD |
29 | if HAVE_LIBCURL | 29 | if HAVE_LIBGNURL |
30 | HTTP_API_TEST = test_transport_api_http | 30 | HTTP_API_TEST = test_transport_api_http |
31 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse | 31 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse |
32 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | 32 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http |
@@ -37,9 +37,9 @@ if HAVE_LIBCURL | |||
37 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https | 37 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https |
38 | HTTPS_REL_TEST = test_transport_api_reliability_https | 38 | HTTPS_REL_TEST = test_transport_api_reliability_https |
39 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ | 39 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ |
40 | test_quota_compliance_https_asymmetric | 40 | test_quota_compliance_https_asymmetric |
41 | endif | ||
41 | endif | 42 | endif |
42 | endif | ||
43 | 43 | ||
44 | if USE_COVERAGE | 44 | if USE_COVERAGE |
45 | AM_CFLAGS = --coverage -O0 | 45 | AM_CFLAGS = --coverage -O0 |
@@ -95,7 +95,7 @@ endif | |||
95 | 95 | ||
96 | if !MINGW | 96 | if !MINGW |
97 | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la | 97 | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la |
98 | UNIX_PLUGIN_TEST = test_transport_api_unix | 98 | UNIX_PLUGIN_TEST = test_transport_api_unix |
99 | UNIX_TEST = test_plugin_unix | 99 | UNIX_TEST = test_plugin_unix |
100 | UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix | 100 | UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix |
101 | UNIX_REL_TEST = test_transport_api_unreliability_unix | 101 | UNIX_REL_TEST = test_transport_api_unreliability_unix |
@@ -122,7 +122,7 @@ libgnunettransporttesting_la_LIBADD = \ | |||
122 | $(top_builddir)/src/hello/libgnunethello.la \ | 122 | $(top_builddir)/src/hello/libgnunethello.la \ |
123 | $(top_builddir)/src/util/libgnunetutil.la \ | 123 | $(top_builddir)/src/util/libgnunetutil.la \ |
124 | $(top_builddir)/src/testing/libgnunettesting.la \ | 124 | $(top_builddir)/src/testing/libgnunettesting.la \ |
125 | $(GN_LIBINTL) | 125 | $(GN_LIBINTL) |
126 | libgnunettransporttesting_la_DEPENDENCIES = \ | 126 | libgnunettransporttesting_la_DEPENDENCIES = \ |
127 | libgnunettransport.la | 127 | libgnunettransport.la |
128 | libgnunettransporttesting_la_LDFLAGS = \ | 128 | libgnunettransporttesting_la_LDFLAGS = \ |
@@ -136,7 +136,7 @@ libgnunettransport_la_SOURCES = \ | |||
136 | libgnunettransport_la_LIBADD = \ | 136 | libgnunettransport_la_LIBADD = \ |
137 | $(top_builddir)/src/hello/libgnunethello.la \ | 137 | $(top_builddir)/src/hello/libgnunethello.la \ |
138 | $(top_builddir)/src/util/libgnunetutil.la \ | 138 | $(top_builddir)/src/util/libgnunetutil.la \ |
139 | $(GN_LIBINTL) | 139 | $(GN_LIBINTL) |
140 | libgnunettransport_la_LDFLAGS = \ | 140 | libgnunettransport_la_LDFLAGS = \ |
141 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 141 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
142 | -version-info 3:0:1 | 142 | -version-info 3:0:1 |
@@ -145,7 +145,7 @@ libexec_PROGRAMS = \ | |||
145 | $(WLAN_BIN) \ | 145 | $(WLAN_BIN) \ |
146 | $(WLAN_BIN_DUMMY) \ | 146 | $(WLAN_BIN_DUMMY) \ |
147 | $(BT_BIN) \ | 147 | $(BT_BIN) \ |
148 | gnunet-service-transport | 148 | gnunet-service-transport |
149 | 149 | ||
150 | bin_PROGRAMS = \ | 150 | bin_PROGRAMS = \ |
151 | gnunet-transport \ | 151 | gnunet-transport \ |
@@ -165,30 +165,30 @@ gnunet_helper_transport_wlan_SOURCES = \ | |||
165 | gnunet_helper_transport_wlan_dummy_SOURCES = \ | 165 | gnunet_helper_transport_wlan_dummy_SOURCES = \ |
166 | gnunet-helper-transport-wlan-dummy.c | 166 | gnunet-helper-transport-wlan-dummy.c |
167 | gnunet_helper_transport_wlan_dummy_LDADD = \ | 167 | gnunet_helper_transport_wlan_dummy_LDADD = \ |
168 | $(top_builddir)/src/util/libgnunetutil.la | 168 | $(top_builddir)/src/util/libgnunetutil.la |
169 | 169 | ||
170 | gnunet_transport_wlan_sender_SOURCES = \ | 170 | gnunet_transport_wlan_sender_SOURCES = \ |
171 | gnunet-transport-wlan-sender.c | 171 | gnunet-transport-wlan-sender.c |
172 | gnunet_transport_wlan_sender_LDADD = \ | 172 | gnunet_transport_wlan_sender_LDADD = \ |
173 | $(top_builddir)/src/util/libgnunetutil.la | 173 | $(top_builddir)/src/util/libgnunetutil.la |
174 | 174 | ||
175 | gnunet_transport_wlan_receiver_SOURCES = \ | 175 | gnunet_transport_wlan_receiver_SOURCES = \ |
176 | gnunet-transport-wlan-receiver.c | 176 | gnunet-transport-wlan-receiver.c |
177 | gnunet_transport_wlan_receiver_LDADD = \ | 177 | gnunet_transport_wlan_receiver_LDADD = \ |
178 | $(top_builddir)/src/util/libgnunetutil.la | 178 | $(top_builddir)/src/util/libgnunetutil.la |
179 | 179 | ||
180 | gnunet_helper_transport_bluetooth_SOURCES = \ | 180 | gnunet_helper_transport_bluetooth_SOURCES = \ |
181 | gnunet-helper-transport-bluetooth.c | 181 | gnunet-helper-transport-bluetooth.c |
182 | if MINGW | 182 | if MINGW |
183 | gnunet_helper_transport_bluetooth_LDADD = \ | 183 | gnunet_helper_transport_bluetooth_LDADD = \ |
184 | $(top_builddir)/src/util/libgnunetutil.la | 184 | $(top_builddir)/src/util/libgnunetutil.la |
185 | gnunet_helper_transport_bluetooth_LDFLAGS = -lws2_32 | 185 | gnunet_helper_transport_bluetooth_LDFLAGS = -lws2_32 |
186 | else | 186 | else |
187 | gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth | 187 | gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth |
188 | endif | 188 | endif |
189 | 189 | ||
190 | gnunet_transport_SOURCES = \ | 190 | gnunet_transport_SOURCES = \ |
191 | gnunet-transport.c | 191 | gnunet-transport.c |
192 | gnunet_transport_LDADD = \ | 192 | gnunet_transport_LDADD = \ |
193 | $(top_builddir)/src/transport/libgnunettransport.la \ | 193 | $(top_builddir)/src/transport/libgnunettransport.la \ |
194 | $(top_builddir)/src/nat/libgnunetnat.la \ | 194 | $(top_builddir)/src/nat/libgnunetnat.la \ |
@@ -196,7 +196,7 @@ gnunet_transport_LDADD = \ | |||
196 | $(top_builddir)/src/util/libgnunetutil.la \ | 196 | $(top_builddir)/src/util/libgnunetutil.la \ |
197 | $(GN_LIBINTL) | 197 | $(GN_LIBINTL) |
198 | gnunet_transport_DEPENDENCIES = \ | 198 | gnunet_transport_DEPENDENCIES = \ |
199 | libgnunettransport.la | 199 | libgnunettransport.la |
200 | 200 | ||
201 | gnunet_service_transport_SOURCES = \ | 201 | gnunet_service_transport_SOURCES = \ |
202 | gnunet-service-transport.c gnunet-service-transport.h \ | 202 | gnunet-service-transport.c gnunet-service-transport.h \ |
@@ -206,7 +206,7 @@ gnunet_service_transport_SOURCES = \ | |||
206 | gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ | 206 | gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ |
207 | gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ | 207 | gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ |
208 | gnunet-service-transport_validation.h gnunet-service-transport_validation.c \ | 208 | gnunet-service-transport_validation.h gnunet-service-transport_validation.c \ |
209 | gnunet-service-transport_manipulation.h gnunet-service-transport_manipulation.c | 209 | gnunet-service-transport_manipulation.h gnunet-service-transport_manipulation.c |
210 | gnunet_service_transport_LDADD = \ | 210 | gnunet_service_transport_LDADD = \ |
211 | $(top_builddir)/src/ats/libgnunetats.la \ | 211 | $(top_builddir)/src/ats/libgnunetats.la \ |
212 | $(top_builddir)/src/hello/libgnunethello.la \ | 212 | $(top_builddir)/src/hello/libgnunethello.la \ |
@@ -258,7 +258,7 @@ libgnunet_plugin_transport_wlan_la_LIBADD = \ | |||
258 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 258 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
259 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 259 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
260 | $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ | 260 | $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ |
261 | $(top_builddir)/src/util/libgnunetutil.la | 261 | $(top_builddir)/src/util/libgnunetutil.la |
262 | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ | 262 | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ |
263 | $(GN_PLUGIN_LDFLAGS) | 263 | $(GN_PLUGIN_LDFLAGS) |
264 | 264 | ||
@@ -305,30 +305,30 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ | |||
305 | $(top_builddir)/src/hello/libgnunethello.la \ | 305 | $(top_builddir)/src/hello/libgnunethello.la \ |
306 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 306 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
307 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 307 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
308 | @LIBCURL@ \ | 308 | @LIBGNURL@ \ |
309 | $(top_builddir)/src/nat/libgnunetnat.la \ | 309 | $(top_builddir)/src/nat/libgnunetnat.la \ |
310 | $(top_builddir)/src/util/libgnunetutil.la | 310 | $(top_builddir)/src/util/libgnunetutil.la |
311 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ | 311 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ |
312 | $(GN_PLUGIN_LDFLAGS) | 312 | $(GN_PLUGIN_LDFLAGS) |
313 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ | 313 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ |
314 | $(CFLAGS) | 314 | $(CFLAGS) |
315 | libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ | 315 | libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ |
316 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 316 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
317 | 317 | ||
318 | 318 | ||
319 | libgnunet_plugin_transport_http_server_la_SOURCES = \ | 319 | libgnunet_plugin_transport_http_server_la_SOURCES = \ |
320 | plugin_transport_http_server.c plugin_transport_http_common.c | 320 | plugin_transport_http_server.c plugin_transport_http_common.c |
321 | libgnunet_plugin_transport_http_server_la_LIBADD = \ | 321 | libgnunet_plugin_transport_http_server_la_LIBADD = \ |
322 | $(top_builddir)/src/hello/libgnunethello.la \ | 322 | $(top_builddir)/src/hello/libgnunethello.la \ |
323 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 323 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
324 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 324 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
325 | $(top_builddir)/src/nat/libgnunetnat.la \ | 325 | $(top_builddir)/src/nat/libgnunetnat.la \ |
326 | $(top_builddir)/src/util/libgnunetutil.la | 326 | $(top_builddir)/src/util/libgnunetutil.la |
327 | libgnunet_plugin_transport_http_server_la_LDFLAGS = \ | 327 | libgnunet_plugin_transport_http_server_la_LDFLAGS = \ |
328 | $(GN_LIBMHD) \ | 328 | $(GN_LIBMHD) \ |
329 | $(GN_PLUGIN_LDFLAGS) | 329 | $(GN_PLUGIN_LDFLAGS) |
330 | libgnunet_plugin_transport_http_server_la_CFLAGS = \ | 330 | libgnunet_plugin_transport_http_server_la_CFLAGS = \ |
331 | $(CFLAGS) | 331 | $(CFLAGS) |
332 | 332 | ||
333 | libgnunet_plugin_transport_https_client_la_SOURCES = \ | 333 | libgnunet_plugin_transport_https_client_la_SOURCES = \ |
334 | plugin_transport_http_client.c plugin_transport_http_common.c | 334 | plugin_transport_http_client.c plugin_transport_http_common.c |
@@ -336,15 +336,15 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ | |||
336 | $(top_builddir)/src/hello/libgnunethello.la \ | 336 | $(top_builddir)/src/hello/libgnunethello.la \ |
337 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 337 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
338 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 338 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
339 | @LIBCURL@ \ | 339 | @LIBGNURL@ \ |
340 | $(top_builddir)/src/nat/libgnunetnat.la \ | 340 | $(top_builddir)/src/nat/libgnunetnat.la \ |
341 | $(top_builddir)/src/util/libgnunetutil.la | 341 | $(top_builddir)/src/util/libgnunetutil.la |
342 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ | 342 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ |
343 | $(GN_PLUGIN_LDFLAGS) | 343 | $(GN_PLUGIN_LDFLAGS) |
344 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ | 344 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ |
345 | $(CFLAGS) -DBUILD_HTTPS | 345 | $(CFLAGS) -DBUILD_HTTPS |
346 | libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ | 346 | libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ |
347 | @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) | 347 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) |
348 | 348 | ||
349 | 349 | ||
350 | libgnunet_plugin_transport_https_server_la_SOURCES = \ | 350 | libgnunet_plugin_transport_https_server_la_SOURCES = \ |
@@ -354,12 +354,12 @@ libgnunet_plugin_transport_https_server_la_LIBADD = \ | |||
354 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 354 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
355 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 355 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
356 | $(top_builddir)/src/nat/libgnunetnat.la \ | 356 | $(top_builddir)/src/nat/libgnunetnat.la \ |
357 | $(top_builddir)/src/util/libgnunetutil.la | 357 | $(top_builddir)/src/util/libgnunetutil.la |
358 | libgnunet_plugin_transport_https_server_la_LDFLAGS = \ | 358 | libgnunet_plugin_transport_https_server_la_LDFLAGS = \ |
359 | $(GN_LIBMHD) \ | 359 | $(GN_LIBMHD) \ |
360 | $(GN_PLUGIN_LDFLAGS) | 360 | $(GN_PLUGIN_LDFLAGS) |
361 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ | 361 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ |
362 | $(CFLAGS) -DBUILD_HTTPS | 362 | $(CFLAGS) -DBUILD_HTTPS |
363 | 363 | ||
364 | 364 | ||
365 | if HAVE_TESTING | 365 | if HAVE_TESTING |
@@ -496,7 +496,7 @@ test_transport_testing_startstop_LDADD = \ | |||
496 | $(top_builddir)/src/util/libgnunetutil.la \ | 496 | $(top_builddir)/src/util/libgnunetutil.la \ |
497 | $(top_builddir)/src/transport/libgnunettransport.la \ | 497 | $(top_builddir)/src/transport/libgnunettransport.la \ |
498 | $(top_builddir)/src/hello/libgnunethello.la \ | 498 | $(top_builddir)/src/hello/libgnunethello.la \ |
499 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 499 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
500 | 500 | ||
501 | test_transport_testing_restart_SOURCES = \ | 501 | test_transport_testing_restart_SOURCES = \ |
502 | test_transport_testing_restart.c | 502 | test_transport_testing_restart.c |
@@ -504,7 +504,7 @@ test_transport_testing_restart_LDADD = \ | |||
504 | $(top_builddir)/src/util/libgnunetutil.la \ | 504 | $(top_builddir)/src/util/libgnunetutil.la \ |
505 | $(top_builddir)/src/transport/libgnunettransport.la \ | 505 | $(top_builddir)/src/transport/libgnunettransport.la \ |
506 | $(top_builddir)/src/hello/libgnunethello.la \ | 506 | $(top_builddir)/src/hello/libgnunethello.la \ |
507 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 507 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
508 | 508 | ||
509 | test_transport_testing_SOURCES = \ | 509 | test_transport_testing_SOURCES = \ |
510 | test_transport_testing.c | 510 | test_transport_testing.c |
@@ -512,7 +512,7 @@ test_transport_testing_LDADD = \ | |||
512 | $(top_builddir)/src/util/libgnunetutil.la \ | 512 | $(top_builddir)/src/util/libgnunetutil.la \ |
513 | $(top_builddir)/src/transport/libgnunettransport.la \ | 513 | $(top_builddir)/src/transport/libgnunettransport.la \ |
514 | $(top_builddir)/src/hello/libgnunethello.la \ | 514 | $(top_builddir)/src/hello/libgnunethello.la \ |
515 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 515 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
516 | 516 | ||
517 | test_transport_api_blacklisting_SOURCES = \ | 517 | test_transport_api_blacklisting_SOURCES = \ |
518 | test_transport_api_blacklisting.c | 518 | test_transport_api_blacklisting.c |
@@ -521,7 +521,7 @@ test_transport_api_blacklisting_LDADD = \ | |||
521 | $(top_builddir)/src/hello/libgnunethello.la \ | 521 | $(top_builddir)/src/hello/libgnunethello.la \ |
522 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 522 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
523 | $(top_builddir)/src/util/libgnunetutil.la \ | 523 | $(top_builddir)/src/util/libgnunetutil.la \ |
524 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 524 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
525 | 525 | ||
526 | test_transport_blacklisting_no_bl_SOURCES = \ | 526 | test_transport_blacklisting_no_bl_SOURCES = \ |
527 | test_transport_blacklisting.c | 527 | test_transport_blacklisting.c |
@@ -530,8 +530,8 @@ test_transport_blacklisting_no_bl_LDADD = \ | |||
530 | $(top_builddir)/src/hello/libgnunethello.la \ | 530 | $(top_builddir)/src/hello/libgnunethello.la \ |
531 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 531 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
532 | $(top_builddir)/src/util/libgnunetutil.la \ | 532 | $(top_builddir)/src/util/libgnunetutil.la \ |
533 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 533 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
534 | 534 | ||
535 | test_transport_blacklisting_outbound_bl_full_SOURCES = \ | 535 | test_transport_blacklisting_outbound_bl_full_SOURCES = \ |
536 | test_transport_blacklisting.c | 536 | test_transport_blacklisting.c |
537 | test_transport_blacklisting_outbound_bl_full_LDADD = \ | 537 | test_transport_blacklisting_outbound_bl_full_LDADD = \ |
@@ -539,8 +539,8 @@ test_transport_blacklisting_outbound_bl_full_LDADD = \ | |||
539 | $(top_builddir)/src/hello/libgnunethello.la \ | 539 | $(top_builddir)/src/hello/libgnunethello.la \ |
540 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 540 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
541 | $(top_builddir)/src/util/libgnunetutil.la \ | 541 | $(top_builddir)/src/util/libgnunetutil.la \ |
542 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 542 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
543 | 543 | ||
544 | test_transport_blacklisting_outbound_bl_plugin_SOURCES = \ | 544 | test_transport_blacklisting_outbound_bl_plugin_SOURCES = \ |
545 | test_transport_blacklisting.c | 545 | test_transport_blacklisting.c |
546 | test_transport_blacklisting_outbound_bl_plugin_LDADD = \ | 546 | test_transport_blacklisting_outbound_bl_plugin_LDADD = \ |
@@ -548,7 +548,7 @@ test_transport_blacklisting_outbound_bl_plugin_LDADD = \ | |||
548 | $(top_builddir)/src/hello/libgnunethello.la \ | 548 | $(top_builddir)/src/hello/libgnunethello.la \ |
549 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 549 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
550 | $(top_builddir)/src/util/libgnunetutil.la \ | 550 | $(top_builddir)/src/util/libgnunetutil.la \ |
551 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 551 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
552 | 552 | ||
553 | test_transport_blacklisting_inbound_bl_full_SOURCES = \ | 553 | test_transport_blacklisting_inbound_bl_full_SOURCES = \ |
554 | test_transport_blacklisting.c | 554 | test_transport_blacklisting.c |
@@ -557,8 +557,8 @@ test_transport_blacklisting_inbound_bl_full_LDADD = \ | |||
557 | $(top_builddir)/src/hello/libgnunethello.la \ | 557 | $(top_builddir)/src/hello/libgnunethello.la \ |
558 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 558 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
559 | $(top_builddir)/src/util/libgnunetutil.la \ | 559 | $(top_builddir)/src/util/libgnunetutil.la \ |
560 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 560 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
561 | 561 | ||
562 | test_transport_blacklisting_inbound_bl_plugin_SOURCES = \ | 562 | test_transport_blacklisting_inbound_bl_plugin_SOURCES = \ |
563 | test_transport_blacklisting.c | 563 | test_transport_blacklisting.c |
564 | test_transport_blacklisting_inbound_bl_plugin_LDADD = \ | 564 | test_transport_blacklisting_inbound_bl_plugin_LDADD = \ |
@@ -566,7 +566,7 @@ test_transport_blacklisting_inbound_bl_plugin_LDADD = \ | |||
566 | $(top_builddir)/src/hello/libgnunethello.la \ | 566 | $(top_builddir)/src/hello/libgnunethello.la \ |
567 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 567 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
568 | $(top_builddir)/src/util/libgnunetutil.la \ | 568 | $(top_builddir)/src/util/libgnunetutil.la \ |
569 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 569 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
570 | 570 | ||
571 | test_transport_blacklisting_multiple_plugins_SOURCES = \ | 571 | test_transport_blacklisting_multiple_plugins_SOURCES = \ |
572 | test_transport_blacklisting.c | 572 | test_transport_blacklisting.c |
@@ -575,7 +575,7 @@ test_transport_blacklisting_multiple_plugins_LDADD = \ | |||
575 | $(top_builddir)/src/hello/libgnunethello.la \ | 575 | $(top_builddir)/src/hello/libgnunethello.la \ |
576 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 576 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
577 | $(top_builddir)/src/util/libgnunetutil.la \ | 577 | $(top_builddir)/src/util/libgnunetutil.la \ |
578 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 578 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
579 | 579 | ||
580 | 580 | ||
581 | test_transport_api_disconnect_tcp_SOURCES = \ | 581 | test_transport_api_disconnect_tcp_SOURCES = \ |
@@ -585,7 +585,7 @@ test_transport_api_disconnect_tcp_LDADD = \ | |||
585 | $(top_builddir)/src/hello/libgnunethello.la \ | 585 | $(top_builddir)/src/hello/libgnunethello.la \ |
586 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 586 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
587 | $(top_builddir)/src/util/libgnunetutil.la \ | 587 | $(top_builddir)/src/util/libgnunetutil.la \ |
588 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 588 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
589 | 589 | ||
590 | test_transport_startonly_SOURCES = \ | 590 | test_transport_startonly_SOURCES = \ |
591 | test_transport_startonly.c | 591 | test_transport_startonly.c |
@@ -594,7 +594,7 @@ test_transport_startonly_LDADD = \ | |||
594 | $(top_builddir)/src/hello/libgnunethello.la \ | 594 | $(top_builddir)/src/hello/libgnunethello.la \ |
595 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 595 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
596 | $(top_builddir)/src/util/libgnunetutil.la \ | 596 | $(top_builddir)/src/util/libgnunetutil.la \ |
597 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 597 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
598 | 598 | ||
599 | test_plugin_tcp_SOURCES = \ | 599 | test_plugin_tcp_SOURCES = \ |
600 | test_plugin_transport.c | 600 | test_plugin_transport.c |
@@ -630,7 +630,7 @@ test_plugin_wlan_LDADD = \ | |||
630 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 630 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
631 | $(top_builddir)/src/hello/libgnunethello.la \ | 631 | $(top_builddir)/src/hello/libgnunethello.la \ |
632 | $(top_builddir)/src/util/libgnunetutil.la \ | 632 | $(top_builddir)/src/util/libgnunetutil.la \ |
633 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 633 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
634 | 634 | ||
635 | test_plugin_bluetooth_SOURCES = \ | 635 | test_plugin_bluetooth_SOURCES = \ |
636 | test_plugin_transport.c | 636 | test_plugin_transport.c |
@@ -639,7 +639,7 @@ test_plugin_bluetooth_LDADD = \ | |||
639 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 639 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
640 | $(top_builddir)/src/hello/libgnunethello.la \ | 640 | $(top_builddir)/src/hello/libgnunethello.la \ |
641 | $(top_builddir)/src/util/libgnunetutil.la \ | 641 | $(top_builddir)/src/util/libgnunetutil.la \ |
642 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 642 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
643 | 643 | ||
644 | test_http_common_SOURCES = \ | 644 | test_http_common_SOURCES = \ |
645 | test_http_common.c plugin_transport_http_common.c | 645 | test_http_common.c plugin_transport_http_common.c |
@@ -648,7 +648,7 @@ test_http_common_LDADD = \ | |||
648 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 648 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
649 | $(top_builddir)/src/hello/libgnunethello.la \ | 649 | $(top_builddir)/src/hello/libgnunethello.la \ |
650 | $(top_builddir)/src/util/libgnunetutil.la \ | 650 | $(top_builddir)/src/util/libgnunetutil.la \ |
651 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 651 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
652 | 652 | ||
653 | test_plugin_http_server_SOURCES = \ | 653 | test_plugin_http_server_SOURCES = \ |
654 | test_plugin_transport.c | 654 | test_plugin_transport.c |
@@ -657,7 +657,7 @@ test_plugin_http_server_LDADD = \ | |||
657 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 657 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
658 | $(top_builddir)/src/hello/libgnunethello.la \ | 658 | $(top_builddir)/src/hello/libgnunethello.la \ |
659 | $(top_builddir)/src/util/libgnunetutil.la \ | 659 | $(top_builddir)/src/util/libgnunetutil.la \ |
660 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 660 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
661 | 661 | ||
662 | test_plugin_https_server_SOURCES = \ | 662 | test_plugin_https_server_SOURCES = \ |
663 | test_plugin_transport.c | 663 | test_plugin_transport.c |
@@ -675,7 +675,7 @@ test_plugin_http_client_LDADD = \ | |||
675 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 675 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
676 | $(top_builddir)/src/hello/libgnunethello.la \ | 676 | $(top_builddir)/src/hello/libgnunethello.la \ |
677 | $(top_builddir)/src/util/libgnunetutil.la \ | 677 | $(top_builddir)/src/util/libgnunetutil.la \ |
678 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 678 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
679 | 679 | ||
680 | test_plugin_https_client_SOURCES = \ | 680 | test_plugin_https_client_SOURCES = \ |
681 | test_plugin_transport.c | 681 | test_plugin_transport.c |
@@ -684,7 +684,7 @@ test_plugin_https_client_LDADD = \ | |||
684 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 684 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
685 | $(top_builddir)/src/hello/libgnunethello.la \ | 685 | $(top_builddir)/src/hello/libgnunethello.la \ |
686 | $(top_builddir)/src/util/libgnunetutil.la \ | 686 | $(top_builddir)/src/util/libgnunetutil.la \ |
687 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 687 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
688 | 688 | ||
689 | test_transport_api_tcp_SOURCES = \ | 689 | test_transport_api_tcp_SOURCES = \ |
690 | test_transport_api.c | 690 | test_transport_api.c |
@@ -709,7 +709,7 @@ test_transport_api_restart_1peer_LDADD = \ | |||
709 | $(top_builddir)/src/hello/libgnunethello.la \ | 709 | $(top_builddir)/src/hello/libgnunethello.la \ |
710 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 710 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
711 | $(top_builddir)/src/util/libgnunetutil.la \ | 711 | $(top_builddir)/src/util/libgnunetutil.la \ |
712 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 712 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
713 | 713 | ||
714 | test_transport_api_restart_2peers_SOURCES = \ | 714 | test_transport_api_restart_2peers_SOURCES = \ |
715 | test_transport_api_restart_2peers.c | 715 | test_transport_api_restart_2peers.c |
@@ -718,7 +718,7 @@ test_transport_api_restart_2peers_LDADD = \ | |||
718 | $(top_builddir)/src/hello/libgnunethello.la \ | 718 | $(top_builddir)/src/hello/libgnunethello.la \ |
719 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 719 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
720 | $(top_builddir)/src/util/libgnunetutil.la \ | 720 | $(top_builddir)/src/util/libgnunetutil.la \ |
721 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 721 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
722 | 722 | ||
723 | test_transport_api_limited_sockets_tcp_SOURCES = \ | 723 | test_transport_api_limited_sockets_tcp_SOURCES = \ |
724 | test_transport_api_limited_sockets.c | 724 | test_transport_api_limited_sockets.c |
@@ -734,7 +734,7 @@ test_transport_api_tcp_nat_LDADD = \ | |||
734 | $(top_builddir)/src/transport/libgnunettransport.la \ | 734 | $(top_builddir)/src/transport/libgnunettransport.la \ |
735 | $(top_builddir)/src/hello/libgnunethello.la \ | 735 | $(top_builddir)/src/hello/libgnunethello.la \ |
736 | $(top_builddir)/src/util/libgnunetutil.la \ | 736 | $(top_builddir)/src/util/libgnunetutil.la \ |
737 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 737 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
738 | 738 | ||
739 | test_transport_api_manipulation_send_tcp_SOURCES = \ | 739 | test_transport_api_manipulation_send_tcp_SOURCES = \ |
740 | test_transport_api_manipulation_send_tcp.c | 740 | test_transport_api_manipulation_send_tcp.c |
@@ -742,7 +742,7 @@ test_transport_api_manipulation_send_tcp_LDADD = \ | |||
742 | $(top_builddir)/src/transport/libgnunettransport.la \ | 742 | $(top_builddir)/src/transport/libgnunettransport.la \ |
743 | $(top_builddir)/src/hello/libgnunethello.la \ | 743 | $(top_builddir)/src/hello/libgnunethello.la \ |
744 | $(top_builddir)/src/util/libgnunetutil.la \ | 744 | $(top_builddir)/src/util/libgnunetutil.la \ |
745 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 745 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
746 | 746 | ||
747 | test_transport_api_manipulation_recv_tcp_SOURCES = \ | 747 | test_transport_api_manipulation_recv_tcp_SOURCES = \ |
748 | test_transport_api_manipulation_recv_tcp.c | 748 | test_transport_api_manipulation_recv_tcp.c |
@@ -750,7 +750,7 @@ test_transport_api_manipulation_recv_tcp_LDADD = \ | |||
750 | $(top_builddir)/src/transport/libgnunettransport.la \ | 750 | $(top_builddir)/src/transport/libgnunettransport.la \ |
751 | $(top_builddir)/src/hello/libgnunethello.la \ | 751 | $(top_builddir)/src/hello/libgnunethello.la \ |
752 | $(top_builddir)/src/util/libgnunetutil.la \ | 752 | $(top_builddir)/src/util/libgnunetutil.la \ |
753 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 753 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
754 | 754 | ||
755 | test_transport_api_manipulation_cfg_SOURCES = \ | 755 | test_transport_api_manipulation_cfg_SOURCES = \ |
756 | test_transport_api_manipulation_cfg.c | 756 | test_transport_api_manipulation_cfg.c |
@@ -758,7 +758,7 @@ test_transport_api_manipulation_cfg_LDADD = \ | |||
758 | $(top_builddir)/src/transport/libgnunettransport.la \ | 758 | $(top_builddir)/src/transport/libgnunettransport.la \ |
759 | $(top_builddir)/src/hello/libgnunethello.la \ | 759 | $(top_builddir)/src/hello/libgnunethello.la \ |
760 | $(top_builddir)/src/util/libgnunetutil.la \ | 760 | $(top_builddir)/src/util/libgnunetutil.la \ |
761 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 761 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
762 | 762 | ||
763 | 763 | ||
764 | 764 | ||
@@ -768,7 +768,7 @@ test_transport_api_reliability_tcp_LDADD = \ | |||
768 | $(top_builddir)/src/transport/libgnunettransport.la \ | 768 | $(top_builddir)/src/transport/libgnunettransport.la \ |
769 | $(top_builddir)/src/hello/libgnunethello.la \ | 769 | $(top_builddir)/src/hello/libgnunethello.la \ |
770 | $(top_builddir)/src/util/libgnunetutil.la \ | 770 | $(top_builddir)/src/util/libgnunetutil.la \ |
771 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 771 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
772 | 772 | ||
773 | test_transport_api_timeout_tcp_SOURCES = \ | 773 | test_transport_api_timeout_tcp_SOURCES = \ |
774 | test_transport_api_timeout.c | 774 | test_transport_api_timeout.c |
@@ -776,7 +776,7 @@ test_transport_api_timeout_tcp_LDADD = \ | |||
776 | $(top_builddir)/src/transport/libgnunettransport.la \ | 776 | $(top_builddir)/src/transport/libgnunettransport.la \ |
777 | $(top_builddir)/src/hello/libgnunethello.la \ | 777 | $(top_builddir)/src/hello/libgnunethello.la \ |
778 | $(top_builddir)/src/util/libgnunetutil.la \ | 778 | $(top_builddir)/src/util/libgnunetutil.la \ |
779 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 779 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
780 | 780 | ||
781 | test_transport_api_timeout_unix_SOURCES = \ | 781 | test_transport_api_timeout_unix_SOURCES = \ |
782 | test_transport_api_timeout.c | 782 | test_transport_api_timeout.c |
@@ -784,7 +784,7 @@ test_transport_api_timeout_unix_LDADD = \ | |||
784 | $(top_builddir)/src/transport/libgnunettransport.la \ | 784 | $(top_builddir)/src/transport/libgnunettransport.la \ |
785 | $(top_builddir)/src/hello/libgnunethello.la \ | 785 | $(top_builddir)/src/hello/libgnunethello.la \ |
786 | $(top_builddir)/src/util/libgnunetutil.la \ | 786 | $(top_builddir)/src/util/libgnunetutil.la \ |
787 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 787 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
788 | 788 | ||
789 | test_transport_api_reliability_tcp_nat_SOURCES = \ | 789 | test_transport_api_reliability_tcp_nat_SOURCES = \ |
790 | test_transport_api_reliability.c | 790 | test_transport_api_reliability.c |
@@ -792,7 +792,7 @@ test_transport_api_reliability_tcp_nat_LDADD = \ | |||
792 | $(top_builddir)/src/transport/libgnunettransport.la \ | 792 | $(top_builddir)/src/transport/libgnunettransport.la \ |
793 | $(top_builddir)/src/hello/libgnunethello.la \ | 793 | $(top_builddir)/src/hello/libgnunethello.la \ |
794 | $(top_builddir)/src/util/libgnunetutil.la \ | 794 | $(top_builddir)/src/util/libgnunetutil.la \ |
795 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 795 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
796 | 796 | ||
797 | test_transport_api_reliability_wlan_SOURCES = \ | 797 | test_transport_api_reliability_wlan_SOURCES = \ |
798 | test_transport_api_reliability.c | 798 | test_transport_api_reliability.c |
@@ -808,7 +808,7 @@ test_transport_api_reliability_bluetooth_LDADD = \ | |||
808 | $(top_builddir)/src/transport/libgnunettransport.la \ | 808 | $(top_builddir)/src/transport/libgnunettransport.la \ |
809 | $(top_builddir)/src/hello/libgnunethello.la \ | 809 | $(top_builddir)/src/hello/libgnunethello.la \ |
810 | $(top_builddir)/src/util/libgnunetutil.la \ | 810 | $(top_builddir)/src/util/libgnunetutil.la \ |
811 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 811 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
812 | 812 | ||
813 | test_transport_api_unreliability_wlan_SOURCES = \ | 813 | test_transport_api_unreliability_wlan_SOURCES = \ |
814 | test_transport_api_unreliability.c | 814 | test_transport_api_unreliability.c |
@@ -816,7 +816,7 @@ test_transport_api_unreliability_wlan_LDADD = \ | |||
816 | $(top_builddir)/src/transport/libgnunettransport.la \ | 816 | $(top_builddir)/src/transport/libgnunettransport.la \ |
817 | $(top_builddir)/src/hello/libgnunethello.la \ | 817 | $(top_builddir)/src/hello/libgnunethello.la \ |
818 | $(top_builddir)/src/util/libgnunetutil.la \ | 818 | $(top_builddir)/src/util/libgnunetutil.la \ |
819 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 819 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
820 | 820 | ||
821 | test_transport_api_unreliability_bluetooth_SOURCES = \ | 821 | test_transport_api_unreliability_bluetooth_SOURCES = \ |
822 | test_transport_api_unreliability.c | 822 | test_transport_api_unreliability.c |
@@ -824,7 +824,7 @@ test_transport_api_unreliability_bluetooth_LDADD = \ | |||
824 | $(top_builddir)/src/transport/libgnunettransport.la \ | 824 | $(top_builddir)/src/transport/libgnunettransport.la \ |
825 | $(top_builddir)/src/hello/libgnunethello.la \ | 825 | $(top_builddir)/src/hello/libgnunethello.la \ |
826 | $(top_builddir)/src/util/libgnunetutil.la \ | 826 | $(top_builddir)/src/util/libgnunetutil.la \ |
827 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 827 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
828 | 828 | ||
829 | test_transport_api_udp_SOURCES = \ | 829 | test_transport_api_udp_SOURCES = \ |
830 | test_transport_api.c | 830 | test_transport_api.c |
@@ -840,7 +840,7 @@ test_transport_api_timeout_udp_LDADD = \ | |||
840 | $(top_builddir)/src/transport/libgnunettransport.la \ | 840 | $(top_builddir)/src/transport/libgnunettransport.la \ |
841 | $(top_builddir)/src/hello/libgnunethello.la \ | 841 | $(top_builddir)/src/hello/libgnunethello.la \ |
842 | $(top_builddir)/src/util/libgnunetutil.la \ | 842 | $(top_builddir)/src/util/libgnunetutil.la \ |
843 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 843 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
844 | 844 | ||
845 | test_transport_api_udp_nat_SOURCES = \ | 845 | test_transport_api_udp_nat_SOURCES = \ |
846 | test_transport_api.c | 846 | test_transport_api.c |
@@ -848,7 +848,7 @@ test_transport_api_udp_nat_LDADD = \ | |||
848 | $(top_builddir)/src/transport/libgnunettransport.la \ | 848 | $(top_builddir)/src/transport/libgnunettransport.la \ |
849 | $(top_builddir)/src/hello/libgnunethello.la \ | 849 | $(top_builddir)/src/hello/libgnunethello.la \ |
850 | $(top_builddir)/src/util/libgnunetutil.la \ | 850 | $(top_builddir)/src/util/libgnunetutil.la \ |
851 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 851 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
852 | 852 | ||
853 | test_transport_api_unix_SOURCES = \ | 853 | test_transport_api_unix_SOURCES = \ |
854 | test_transport_api.c | 854 | test_transport_api.c |
@@ -856,7 +856,7 @@ test_transport_api_unix_LDADD = \ | |||
856 | $(top_builddir)/src/transport/libgnunettransport.la \ | 856 | $(top_builddir)/src/transport/libgnunettransport.la \ |
857 | $(top_builddir)/src/hello/libgnunethello.la \ | 857 | $(top_builddir)/src/hello/libgnunethello.la \ |
858 | $(top_builddir)/src/util/libgnunetutil.la \ | 858 | $(top_builddir)/src/util/libgnunetutil.la \ |
859 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 859 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
860 | 860 | ||
861 | # HTTP tests | 861 | # HTTP tests |
862 | test_transport_api_http_SOURCES = \ | 862 | test_transport_api_http_SOURCES = \ |
@@ -881,7 +881,7 @@ test_transport_api_timeout_http_LDADD = \ | |||
881 | $(top_builddir)/src/transport/libgnunettransport.la \ | 881 | $(top_builddir)/src/transport/libgnunettransport.la \ |
882 | $(top_builddir)/src/hello/libgnunethello.la \ | 882 | $(top_builddir)/src/hello/libgnunethello.la \ |
883 | $(top_builddir)/src/util/libgnunetutil.la \ | 883 | $(top_builddir)/src/util/libgnunetutil.la \ |
884 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 884 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
885 | 885 | ||
886 | test_transport_api_reliability_http_SOURCES = \ | 886 | test_transport_api_reliability_http_SOURCES = \ |
887 | test_transport_api_reliability.c | 887 | test_transport_api_reliability.c |
@@ -889,7 +889,7 @@ test_transport_api_reliability_http_LDADD = \ | |||
889 | $(top_builddir)/src/transport/libgnunettransport.la \ | 889 | $(top_builddir)/src/transport/libgnunettransport.la \ |
890 | $(top_builddir)/src/hello/libgnunethello.la \ | 890 | $(top_builddir)/src/hello/libgnunethello.la \ |
891 | $(top_builddir)/src/util/libgnunetutil.la \ | 891 | $(top_builddir)/src/util/libgnunetutil.la \ |
892 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 892 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
893 | 893 | ||
894 | test_quota_compliance_http_SOURCES = \ | 894 | test_quota_compliance_http_SOURCES = \ |
895 | test_quota_compliance.c | 895 | test_quota_compliance.c |
@@ -897,7 +897,7 @@ test_quota_compliance_http_LDADD = \ | |||
897 | $(top_builddir)/src/transport/libgnunettransport.la \ | 897 | $(top_builddir)/src/transport/libgnunettransport.la \ |
898 | $(top_builddir)/src/hello/libgnunethello.la \ | 898 | $(top_builddir)/src/hello/libgnunethello.la \ |
899 | $(top_builddir)/src/util/libgnunetutil.la \ | 899 | $(top_builddir)/src/util/libgnunetutil.la \ |
900 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 900 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
901 | 901 | ||
902 | test_quota_compliance_http_asymmetric_SOURCES = \ | 902 | test_quota_compliance_http_asymmetric_SOURCES = \ |
903 | test_quota_compliance.c | 903 | test_quota_compliance.c |
@@ -930,7 +930,7 @@ test_transport_api_https_LDADD = \ | |||
930 | $(top_builddir)/src/transport/libgnunettransport.la \ | 930 | $(top_builddir)/src/transport/libgnunettransport.la \ |
931 | $(top_builddir)/src/hello/libgnunethello.la \ | 931 | $(top_builddir)/src/hello/libgnunethello.la \ |
932 | $(top_builddir)/src/util/libgnunetutil.la \ | 932 | $(top_builddir)/src/util/libgnunetutil.la \ |
933 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 933 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
934 | 934 | ||
935 | test_transport_api_timeout_https_SOURCES = \ | 935 | test_transport_api_timeout_https_SOURCES = \ |
936 | test_transport_api_timeout.c | 936 | test_transport_api_timeout.c |
@@ -938,7 +938,7 @@ test_transport_api_timeout_https_LDADD = \ | |||
938 | $(top_builddir)/src/transport/libgnunettransport.la \ | 938 | $(top_builddir)/src/transport/libgnunettransport.la \ |
939 | $(top_builddir)/src/hello/libgnunethello.la \ | 939 | $(top_builddir)/src/hello/libgnunethello.la \ |
940 | $(top_builddir)/src/util/libgnunetutil.la \ | 940 | $(top_builddir)/src/util/libgnunetutil.la \ |
941 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 941 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
942 | 942 | ||
943 | 943 | ||
944 | test_transport_api_reliability_https_SOURCES = \ | 944 | test_transport_api_reliability_https_SOURCES = \ |
@@ -947,7 +947,7 @@ test_transport_api_reliability_https_LDADD = \ | |||
947 | $(top_builddir)/src/transport/libgnunettransport.la \ | 947 | $(top_builddir)/src/transport/libgnunettransport.la \ |
948 | $(top_builddir)/src/hello/libgnunethello.la \ | 948 | $(top_builddir)/src/hello/libgnunethello.la \ |
949 | $(top_builddir)/src/util/libgnunetutil.la \ | 949 | $(top_builddir)/src/util/libgnunetutil.la \ |
950 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 950 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
951 | 951 | ||
952 | test_transport_api_unreliability_unix_SOURCES = \ | 952 | test_transport_api_unreliability_unix_SOURCES = \ |
953 | test_transport_api_unreliability.c | 953 | test_transport_api_unreliability.c |
@@ -955,7 +955,7 @@ test_transport_api_unreliability_unix_LDADD = \ | |||
955 | $(top_builddir)/src/transport/libgnunettransport.la \ | 955 | $(top_builddir)/src/transport/libgnunettransport.la \ |
956 | $(top_builddir)/src/hello/libgnunethello.la \ | 956 | $(top_builddir)/src/hello/libgnunethello.la \ |
957 | $(top_builddir)/src/util/libgnunetutil.la \ | 957 | $(top_builddir)/src/util/libgnunetutil.la \ |
958 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 958 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
959 | 959 | ||
960 | test_transport_api_unreliability_udp_SOURCES = \ | 960 | test_transport_api_unreliability_udp_SOURCES = \ |
961 | test_transport_api_unreliability.c | 961 | test_transport_api_unreliability.c |
@@ -963,7 +963,7 @@ test_transport_api_unreliability_udp_LDADD = \ | |||
963 | $(top_builddir)/src/transport/libgnunettransport.la \ | 963 | $(top_builddir)/src/transport/libgnunettransport.la \ |
964 | $(top_builddir)/src/hello/libgnunethello.la \ | 964 | $(top_builddir)/src/hello/libgnunethello.la \ |
965 | $(top_builddir)/src/util/libgnunetutil.la \ | 965 | $(top_builddir)/src/util/libgnunetutil.la \ |
966 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 966 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
967 | 967 | ||
968 | test_transport_api_unreliability_constant_udp_SOURCES = \ | 968 | test_transport_api_unreliability_constant_udp_SOURCES = \ |
969 | test_transport_api_unreliability_constant.c | 969 | test_transport_api_unreliability_constant.c |
@@ -971,7 +971,7 @@ test_transport_api_unreliability_constant_udp_LDADD = \ | |||
971 | $(top_builddir)/src/transport/libgnunettransport.la \ | 971 | $(top_builddir)/src/transport/libgnunettransport.la \ |
972 | $(top_builddir)/src/hello/libgnunethello.la \ | 972 | $(top_builddir)/src/hello/libgnunethello.la \ |
973 | $(top_builddir)/src/util/libgnunetutil.la \ | 973 | $(top_builddir)/src/util/libgnunetutil.la \ |
974 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 974 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
975 | 975 | ||
976 | if LINUX | 976 | if LINUX |
977 | test_transport_api_wlan_SOURCES = \ | 977 | test_transport_api_wlan_SOURCES = \ |
@@ -980,7 +980,7 @@ test_transport_api_wlan_LDADD = \ | |||
980 | $(top_builddir)/src/transport/libgnunettransport.la \ | 980 | $(top_builddir)/src/transport/libgnunettransport.la \ |
981 | $(top_builddir)/src/hello/libgnunethello.la \ | 981 | $(top_builddir)/src/hello/libgnunethello.la \ |
982 | $(top_builddir)/src/util/libgnunetutil.la \ | 982 | $(top_builddir)/src/util/libgnunetutil.la \ |
983 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 983 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
984 | endif | 984 | endif |
985 | 985 | ||
986 | if LINUX | 986 | if LINUX |
@@ -991,7 +991,7 @@ test_transport_api_bluetooth_LDADD = \ | |||
991 | $(top_builddir)/src/transport/libgnunettransport.la \ | 991 | $(top_builddir)/src/transport/libgnunettransport.la \ |
992 | $(top_builddir)/src/hello/libgnunethello.la \ | 992 | $(top_builddir)/src/hello/libgnunethello.la \ |
993 | $(top_builddir)/src/util/libgnunetutil.la \ | 993 | $(top_builddir)/src/util/libgnunetutil.la \ |
994 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 994 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
995 | endif | 995 | endif |
996 | endif | 996 | endif |
997 | 997 | ||
@@ -1001,7 +1001,7 @@ test_quota_compliance_tcp_LDADD = \ | |||
1001 | $(top_builddir)/src/transport/libgnunettransport.la \ | 1001 | $(top_builddir)/src/transport/libgnunettransport.la \ |
1002 | $(top_builddir)/src/hello/libgnunethello.la \ | 1002 | $(top_builddir)/src/hello/libgnunethello.la \ |
1003 | $(top_builddir)/src/util/libgnunetutil.la \ | 1003 | $(top_builddir)/src/util/libgnunetutil.la \ |
1004 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 1004 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
1005 | 1005 | ||
1006 | test_quota_compliance_tcp_asymmetric_SOURCES = \ | 1006 | test_quota_compliance_tcp_asymmetric_SOURCES = \ |
1007 | test_quota_compliance.c | 1007 | test_quota_compliance.c |
@@ -1009,7 +1009,7 @@ test_quota_compliance_tcp_asymmetric_LDADD = \ | |||
1009 | $(top_builddir)/src/transport/libgnunettransport.la \ | 1009 | $(top_builddir)/src/transport/libgnunettransport.la \ |
1010 | $(top_builddir)/src/hello/libgnunethello.la \ | 1010 | $(top_builddir)/src/hello/libgnunethello.la \ |
1011 | $(top_builddir)/src/util/libgnunetutil.la \ | 1011 | $(top_builddir)/src/util/libgnunetutil.la \ |
1012 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 1012 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
1013 | 1013 | ||
1014 | test_quota_compliance_udp_SOURCES = \ | 1014 | test_quota_compliance_udp_SOURCES = \ |
1015 | test_quota_compliance.c | 1015 | test_quota_compliance.c |
@@ -1073,7 +1073,7 @@ test_transport_api_multi_LDADD = \ | |||
1073 | $(top_builddir)/src/transport/libgnunettransport.la \ | 1073 | $(top_builddir)/src/transport/libgnunettransport.la \ |
1074 | $(top_builddir)/src/hello/libgnunethello.la \ | 1074 | $(top_builddir)/src/hello/libgnunethello.la \ |
1075 | $(top_builddir)/src/util/libgnunetutil.la \ | 1075 | $(top_builddir)/src/util/libgnunetutil.la \ |
1076 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 1076 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
1077 | 1077 | ||
1078 | 1078 | ||
1079 | EXTRA_DIST = \ | 1079 | EXTRA_DIST = \ |
@@ -1186,4 +1186,4 @@ test_transport_blacklisting_cfg_blp_peer2_plugin.conf \ | |||
1186 | test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf \ | 1186 | test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf \ |
1187 | test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf \ | 1187 | test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf \ |
1188 | test_transport_api_http_reverse_peer1.conf \ | 1188 | test_transport_api_http_reverse_peer1.conf \ |
1189 | test_transport_api_http_reverse_peer2.conf | 1189 | test_transport_api_http_reverse_peer2.conf |