From 6be112bbd13b5e6708decbf92f953326ecac8a25 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 23 Oct 2013 09:32:28 +0000 Subject: -moving from libcurl to libgnurl --- configure.ac | 18 ++-- m4/libcurl.m4 | 250 ---------------------------------------------- m4/libgnurl.m4 | 250 ++++++++++++++++++++++++++++++++++++++++++++++ src/gns/Makefile.am | 4 +- src/hostlist/Makefile.am | 16 +-- src/pt/Makefile.am | 36 +++---- src/transport/Makefile.am | 164 +++++++++++++++--------------- 7 files changed, 369 insertions(+), 369 deletions(-) delete mode 100644 m4/libcurl.m4 create mode 100644 m4/libgnurl.m4 diff --git a/configure.ac b/configure.ac index 374f00cab..92130c6e4 100644 --- a/configure.ac +++ b/configure.ac @@ -402,14 +402,14 @@ else fi -# libcurl -LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0) -if test "$curl" = 1 +# libgnurl +LIBGNURL_CHECK_CONFIG(,7.33.0,gnurl=1,gnurl=0) +if test "$gnurl" = 1 then - AM_CONDITIONAL(HAVE_LIBCURL, true) - AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl]) + AM_CONDITIONAL(HAVE_LIBGNURL, true) + AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) else - AM_CONDITIONAL(HAVE_LIBCURL, false) + AM_CONDITIONAL(HAVE_LIBGNURL, false) fi @@ -1462,10 +1462,10 @@ then AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.]) fi -# libcurl -if test "x$curl" = "x0" +# libgnurl +if test "x$gnurl" = "x0" then - AC_MSG_NOTICE([NOTICE: libcurl not found. http client support will not be compiled.]) + AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) fi # 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 @@ -# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], -# [ACTION-IF-YES], [ACTION-IF-NO]) -# ---------------------------------------------------------- -# David Shaw May-09-2006 -# -# Checks for libcurl. DEFAULT-ACTION is the string yes or no to -# specify whether to default to --with-libcurl or --without-libcurl. -# If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the -# minimum version of libcurl to accept. Pass the version as a regular -# version number like 7.10.1. If not supplied, any version is -# accepted. ACTION-IF-YES is a list of shell commands to run if -# libcurl was successfully found and passed the various tests. -# ACTION-IF-NO is a list of shell commands that are run otherwise. -# Note that using --without-libcurl does run ACTION-IF-NO. -# -# This macro #defines HAVE_LIBCURL if a working libcurl setup is -# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary -# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are -# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy -# where yyy are the various protocols supported by libcurl. Both xxx -# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of -# the macro for the complete list of possible defines. Shell -# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also -# defined to 'yes' for those features and protocols that were found. -# Note that xxx and yyy keep the same capitalization as in the -# curl-config list (e.g. it's "HTTP" and not "http"). -# -# Users may override the detected values by doing something like: -# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure -# -# For the sake of sanity, this macro assumes that any libcurl that is -# found is after version 7.7.2, the first version that included the -# curl-config script. Note that it is very important for people -# packaging binary versions of libcurl to include this script! -# Without curl-config, we can only guess what protocols are available, -# or use curl_version_info to figure it out at runtime. - -AC_DEFUN([LIBCURL_CHECK_CONFIG], -[ - AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL]) - AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4]) - AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6]) - AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz]) - AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS]) - AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN]) - AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI]) - AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM]) - - AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) - AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) - AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) - AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) - AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) - AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_RTSP],[Defined if libcurl supports RTSP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3]) - AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) - - AC_ARG_WITH(libcurl, - AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), - [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) - - if test "$_libcurl_with" != "no" ; then - - AC_PROG_AWK - - _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" - - _libcurl_try_link=yes - - if test -d "$_libcurl_with" ; then - LIBCURL_CPPFLAGS="-I$withval/include" - _libcurl_ldflags="-L$withval/lib" - AC_PATH_PROG([_libcurl_config],[curl-config],[], - ["$withval/bin"]) - else - AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH]) - fi - - if test x$_libcurl_config != "x" ; then - AC_CACHE_CHECK([for the version of libcurl], - [libcurl_cv_lib_curl_version], - [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) - - _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` - _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` - - if test $_libcurl_wanted -gt 0 ; then - AC_CACHE_CHECK([for libcurl >= version $2], - [libcurl_cv_lib_version_ok], - [ - if test $_libcurl_version -ge $_libcurl_wanted ; then - libcurl_cv_lib_version_ok=yes - else - libcurl_cv_lib_version_ok=no - fi - ]) - fi - - if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then - if test x"$LIBCURL_CPPFLAGS" = "x" ; then - LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` - fi - if test x"$LIBCURL" = "x" ; then - LIBCURL=`$_libcurl_config --libs` - - # This is so silly, but Apple actually has a bug in their - # curl-config script. Fixed in Tiger, but there are still - # lots of Panther installs around. - case "${host}" in - powerpc-apple-darwin7*) - LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` - ;; - esac - fi - - # All curl-config scripts support --feature - _libcurl_features=`$_libcurl_config --feature` - - # Is it modern enough to have --protocols? (7.12.4) - if test $_libcurl_version -ge 461828 ; then - _libcurl_protocols=`$_libcurl_config --protocols` - fi - else - _libcurl_try_link=no - fi - - unset _libcurl_wanted - fi - - if test $_libcurl_try_link = yes ; then - - # we didn't find curl-config, so let's see if the user-supplied - # link line (or failing that, "-lcurl") is enough. - LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"} - - AC_CACHE_CHECK([whether libcurl is usable], - [libcurl_cv_lib_curl_usable], - [ - _libcurl_save_cppflags=$CPPFLAGS - CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS" - _libcurl_save_libs=$LIBS - LIBS="$LIBCURL $LIBS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[ -/* Try and use a few common options to force a failure if we are - missing symbols or can't link. */ -int x; -curl_easy_setopt(NULL,CURLOPT_URL,NULL); -x=CURL_ERROR_SIZE; -x=CURLOPT_WRITEFUNCTION; -x=CURLOPT_FILE; -x=CURLOPT_ERRORBUFFER; -x=CURLOPT_STDERR; -x=CURLOPT_VERBOSE; -])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) - - CPPFLAGS=$_libcurl_save_cppflags - LIBS=$_libcurl_save_libs - unset _libcurl_save_cppflags - unset _libcurl_save_libs - ]) - - if test $libcurl_cv_lib_curl_usable = yes ; then - - # Does curl_free() exist in this version of libcurl? - # If not, fake it with free() - - _libcurl_save_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" - _libcurl_save_libs=$LIBS - LIBS="$LIBS $LIBCURL" - - AC_CHECK_FUNC(curl_free,, - AC_DEFINE(curl_free,free, - [Define curl_free() as free() if our version of curl lacks curl_free.])) - - CPPFLAGS=$_libcurl_save_cppflags - LIBS=$_libcurl_save_libs - unset _libcurl_save_cppflags - unset _libcurl_save_libs - - AC_DEFINE(HAVE_LIBCURL,1, - [Define to 1 if you have a functional curl library.]) - AC_SUBST(LIBCURL_CPPFLAGS) - AC_SUBST(LIBCURL) - - for _libcurl_feature in $_libcurl_features ; do - AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1]) - eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes - done - - if test "x$_libcurl_protocols" = "x" ; then - - # We don't have --protocols, so just assume that all - # protocols are available - _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" - - if test x$libcurl_feature_SSL = xyes ; then - _libcurl_protocols="$_libcurl_protocols HTTPS" - - # FTPS wasn't standards-compliant until version - # 7.11.0 (0x070b00 == 461568) - if test $_libcurl_version -ge 461568; then - _libcurl_protocols="$_libcurl_protocols FTPS" - fi - fi - - # RTSP, IMAP, POP3 and SMTP were added in - # 7.20.0 (0x071400 == 463872) - if test $_libcurl_version -ge 463872; then - _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP" - fi - fi - - for _libcurl_protocol in $_libcurl_protocols ; do - AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) - eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes - done - else - unset LIBCURL - unset LIBCURL_CPPFLAGS - fi - fi - - unset _libcurl_try_link - unset _libcurl_version_parse - unset _libcurl_config - unset _libcurl_feature - unset _libcurl_features - unset _libcurl_protocol - unset _libcurl_protocols - unset _libcurl_version - unset _libcurl_ldflags - fi - - if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then - # This is the IF-NO path - ifelse([$4],,:,[$4]) - else - # This is the IF-YES path - ifelse([$3],,:,[$3]) - fi - - unset _libcurl_with -])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 @@ +# LIBGNURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], +# [ACTION-IF-YES], [ACTION-IF-NO]) +# ---------------------------------------------------------- +# David Shaw May-09-2006 +# +# Checks for libgnurl. DEFAULT-ACTION is the string yes or no to +# specify whether to default to --with-libgnurl or --without-libgnurl. +# If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the +# minimum version of libgnurl to accept. Pass the version as a regular +# version number like 7.10.1. If not supplied, any version is +# accepted. ACTION-IF-YES is a list of shell commands to run if +# libgnurl was successfully found and passed the various tests. +# ACTION-IF-NO is a list of shell commands that are run otherwise. +# Note that using --without-libgnurl does run ACTION-IF-NO. +# +# This macro #defines HAVE_LIBGNURL if a working libgnurl setup is +# found, and sets @LIBGNURL@ and @LIBGNURL_CPPFLAGS@ to the necessary +# values. Other useful defines are LIBGNURL_FEATURE_xxx where xxx are +# the various features supported by libgnurl, and LIBGNURL_PROTOCOL_yyy +# where yyy are the various protocols supported by libgnurl. Both xxx +# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of +# the macro for the complete list of possible defines. Shell +# variables $libgnurl_feature_xxx and $libgnurl_protocol_yyy are also +# defined to 'yes' for those features and protocols that were found. +# Note that xxx and yyy keep the same capitalization as in the +# gnurl-config list (e.g. it's "HTTP" and not "http"). +# +# Users may override the detected values by doing something like: +# LIBGNURL="-lgnurl" LIBGNURL_CPPFLAGS="-I/usr/myinclude" ./configure +# +# For the sake of sanity, this macro assumes that any libgnurl that is +# found is after version 7.7.2, the first version that included the +# gnurl-config script. Note that it is very important for people +# packaging binary versions of libgnurl to include this script! +# Without gnurl-config, we can only guess what protocols are available, +# or use gnurl_version_info to figure it out at runtime. + +AC_DEFUN([LIBGNURL_CHECK_CONFIG], +[ + AH_TEMPLATE([LIBGNURL_FEATURE_SSL],[Defined if libgnurl supports SSL]) + AH_TEMPLATE([LIBGNURL_FEATURE_KRB4],[Defined if libgnurl supports KRB4]) + AH_TEMPLATE([LIBGNURL_FEATURE_IPV6],[Defined if libgnurl supports IPv6]) + AH_TEMPLATE([LIBGNURL_FEATURE_LIBZ],[Defined if libgnurl supports libz]) + AH_TEMPLATE([LIBGNURL_FEATURE_ASYNCHDNS],[Defined if libgnurl supports AsynchDNS]) + AH_TEMPLATE([LIBGNURL_FEATURE_IDN],[Defined if libgnurl supports IDN]) + AH_TEMPLATE([LIBGNURL_FEATURE_SSPI],[Defined if libgnurl supports SSPI]) + AH_TEMPLATE([LIBGNURL_FEATURE_NTLM],[Defined if libgnurl supports NTLM]) + + AH_TEMPLATE([LIBGNURL_PROTOCOL_HTTP],[Defined if libgnurl supports HTTP]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_HTTPS],[Defined if libgnurl supports HTTPS]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_FTP],[Defined if libgnurl supports FTP]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_FTPS],[Defined if libgnurl supports FTPS]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_FILE],[Defined if libgnurl supports FILE]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_TELNET],[Defined if libgnurl supports TELNET]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_LDAP],[Defined if libgnurl supports LDAP]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_DICT],[Defined if libgnurl supports DICT]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_TFTP],[Defined if libgnurl supports TFTP]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_RTSP],[Defined if libgnurl supports RTSP]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_POP3],[Defined if libgnurl supports POP3]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_IMAP],[Defined if libgnurl supports IMAP]) + AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP]) + + AC_ARG_WITH(libgnurl, + AC_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]), + [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])]) + + if test "$_libgnurl_with" != "no" ; then + + AC_PROG_AWK + + _libgnurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" + + _libgnurl_try_link=yes + + if test -d "$_libgnurl_with" ; then + LIBGNURL_CPPFLAGS="-I$withval/include" + _libgnurl_ldflags="-L$withval/lib" + AC_PATH_PROG([_libgnurl_config],[gnurl-config],[], + ["$withval/bin"]) + else + AC_PATH_PROG([_libgnurl_config],[gnurl-config],[],[$PATH]) + fi + + if test x$_libgnurl_config != "x" ; then + AC_CACHE_CHECK([for the version of libgnurl], + [libgnurl_cv_lib_gnurl_version], + [libgnurl_cv_lib_gnurl_version=`$_libgnurl_config --version | $AWK '{print $[]2}'`]) + + _libgnurl_version=`echo $libgnurl_cv_lib_gnurl_version | $_libgnurl_version_parse` + _libgnurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libgnurl_version_parse` + + if test $_libgnurl_wanted -gt 0 ; then + AC_CACHE_CHECK([for libgnurl >= version $2], + [libgnurl_cv_lib_version_ok], + [ + if test $_libgnurl_version -ge $_libgnurl_wanted ; then + libgnurl_cv_lib_version_ok=yes + else + libgnurl_cv_lib_version_ok=no + fi + ]) + fi + + if test $_libgnurl_wanted -eq 0 || test x$libgnurl_cv_lib_version_ok = xyes ; then + if test x"$LIBGNURL_CPPFLAGS" = "x" ; then + LIBGNURL_CPPFLAGS=`$_libgnurl_config --cflags` + fi + if test x"$LIBGNURL" = "x" ; then + LIBGNURL=`$_libgnurl_config --libs` + + # This is so silly, but Apple actually has a bug in their + # gnurl-config script. Fixed in Tiger, but there are still + # lots of Panther installs around. + case "${host}" in + powerpc-apple-darwin7*) + LIBGNURL=`echo $LIBGNURL | sed -e 's|-arch i386||g'` + ;; + esac + fi + + # All gnurl-config scripts support --feature + _libgnurl_features=`$_libgnurl_config --feature` + + # Is it modern enough to have --protocols? (7.12.4) + if test $_libgnurl_version -ge 461828 ; then + _libgnurl_protocols=`$_libgnurl_config --protocols` + fi + else + _libgnurl_try_link=no + fi + + unset _libgnurl_wanted + fi + + if test $_libgnurl_try_link = yes ; then + + # we didn't find gnurl-config, so let's see if the user-supplied + # link line (or failing that, "-lgnurl") is enough. + LIBGNURL=${LIBGNURL-"$_libgnurl_ldflags -lgnurl"} + + AC_CACHE_CHECK([whether libgnurl is usable], + [libgnurl_cv_lib_gnurl_usable], + [ + _libgnurl_save_cppflags=$CPPFLAGS + CPPFLAGS="$LIBGNURL_CPPFLAGS $CPPFLAGS" + _libgnurl_save_libs=$LIBS + LIBS="$LIBGNURL $LIBS" + + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[ +/* Try and use a few common options to force a failure if we are + missing symbols or can't link. */ +int x; +gnurl_easy_setopt(NULL,GNURLOPT_URL,NULL); +x=GNURL_ERROR_SIZE; +x=GNURLOPT_WRITEFUNCTION; +x=GNURLOPT_FILE; +x=GNURLOPT_ERRORBUFFER; +x=GNURLOPT_STDERR; +x=GNURLOPT_VERBOSE; +])],libgnurl_cv_lib_gnurl_usable=yes,libgnurl_cv_lib_gnurl_usable=no) + + CPPFLAGS=$_libgnurl_save_cppflags + LIBS=$_libgnurl_save_libs + unset _libgnurl_save_cppflags + unset _libgnurl_save_libs + ]) + + if test $libgnurl_cv_lib_gnurl_usable = yes ; then + + # Does gnurl_free() exist in this version of libgnurl? + # If not, fake it with free() + + _libgnurl_save_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBGNURL_CPPFLAGS" + _libgnurl_save_libs=$LIBS + LIBS="$LIBS $LIBGNURL" + + AC_CHECK_FUNC(gnurl_free,, + AC_DEFINE(gnurl_free,free, + [Define gnurl_free() as free() if our version of gnurl lacks gnurl_free.])) + + CPPFLAGS=$_libgnurl_save_cppflags + LIBS=$_libgnurl_save_libs + unset _libgnurl_save_cppflags + unset _libgnurl_save_libs + + AC_DEFINE(HAVE_LIBGNURL,1, + [Define to 1 if you have a functional gnurl library.]) + AC_SUBST(LIBGNURL_CPPFLAGS) + AC_SUBST(LIBGNURL) + + for _libgnurl_feature in $_libgnurl_features ; do + AC_DEFINE_UNQUOTED(AS_TR_CPP(libgnurl_feature_$_libgnurl_feature),[1]) + eval AS_TR_SH(libgnurl_feature_$_libgnurl_feature)=yes + done + + if test "x$_libgnurl_protocols" = "x" ; then + + # We don't have --protocols, so just assume that all + # protocols are available + _libgnurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" + + if test x$libgnurl_feature_SSL = xyes ; then + _libgnurl_protocols="$_libgnurl_protocols HTTPS" + + # FTPS wasn't standards-compliant until version + # 7.11.0 (0x070b00 == 461568) + if test $_libgnurl_version -ge 461568; then + _libgnurl_protocols="$_libgnurl_protocols FTPS" + fi + fi + + # RTSP, IMAP, POP3 and SMTP were added in + # 7.20.0 (0x071400 == 463872) + if test $_libgnurl_version -ge 463872; then + _libgnurl_protocols="$_libgnurl_protocols RTSP IMAP POP3 SMTP" + fi + fi + + for _libgnurl_protocol in $_libgnurl_protocols ; do + AC_DEFINE_UNQUOTED(AS_TR_CPP(libgnurl_protocol_$_libgnurl_protocol),[1]) + eval AS_TR_SH(libgnurl_protocol_$_libgnurl_protocol)=yes + done + else + unset LIBGNURL + unset LIBGNURL_CPPFLAGS + fi + fi + + unset _libgnurl_try_link + unset _libgnurl_version_parse + unset _libgnurl_config + unset _libgnurl_feature + unset _libgnurl_features + unset _libgnurl_protocol + unset _libgnurl_protocols + unset _libgnurl_version + unset _libgnurl_ldflags + fi + + if test x$_libgnurl_with = xno || test x$libgnurl_cv_lib_gnurl_usable != xyes ; then + # This is the IF-NO path + ifelse([$4],,:,[$4]) + else + # This is the IF-YES path + ifelse([$3],,:,[$3]) + fi + + unset _libgnurl_with +])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 = \ if HAVE_MHD if HAVE_GNUTLS -if HAVE_LIBCURL +if HAVE_LIBGNURL # DO_PROXY=gnunet-gns-proxy endif endif @@ -119,7 +119,7 @@ gnunet_dns2gns_DEPENDENCIES = \ gnunet_gns_proxy_SOURCES = \ gnunet-gns-proxy.c -gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \ +gnunet_gns_proxy_LDADD = -lmicrohttpd -lgnurl -lgnutls \ $(top_builddir)/src/gns/libgnunetgns.la \ $(top_builddir)/src/identity/libgnunetidentity.la \ $(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 endif if HAVE_MHD - HOSTLIST_SERVER_SOURCES = hostlist-server.c hostlist-server.h + HOSTLIST_SERVER_SOURCES = hostlist-server.c hostlist-server.h GN_LIBMHD = -lmicrohttpd endif -if HAVE_LIBCURL +if HAVE_LIBGNURL libexec_PROGRAMS = \ gnunet-daemon-hostlist endif @@ -34,13 +34,13 @@ gnunet_daemon_hostlist_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBMHD) \ - @LIBCURL@ \ + @LIBGNURL@ \ $(GN_LIBINTL) gnunet_daemon_hostlist_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -if HAVE_LIBCURL +if HAVE_LIBGNURL check_PROGRAMS = \ test_gnunet_daemon_hostlist \ test_gnunet_daemon_hostlist_reconnect \ @@ -60,13 +60,13 @@ test_gnunet_daemon_hostlist_SOURCES = \ test_gnunet_daemon_hostlist.c test_gnunet_daemon_hostlist_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_daemon_hostlist_reconnect_SOURCES = \ test_gnunet_daemon_hostlist_reconnect.c test_gnunet_daemon_hostlist_reconnect_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_daemon_hostlist_learning_SOURCES = \ test_gnunet_daemon_hostlist_learning.c @@ -74,7 +74,7 @@ test_gnunet_daemon_hostlist_learning_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la EXTRA_DIST = \ 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 = \ pt.conf libexec_PROGRAMS = \ - gnunet-daemon-pt + gnunet-daemon-pt gnunet_daemon_pt_SOURCES = \ - gnunet-daemon-pt.c + gnunet-daemon-pt.c gnunet_daemon_pt_LDADD = \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/mesh/libgnunetmesh.la \ @@ -34,7 +34,7 @@ gnunet_daemon_pt_LDADD = \ if HAVE_TESTING if HAVE_MHD -if HAVE_LIBCURL +if HAVE_LIBGNURL if LINUX VPN_TEST = \ test_gnunet_vpn-4_to_6 \ @@ -48,7 +48,7 @@ if MINGW test_gnunet_vpn-4_to_6 \ test_gnunet_vpn-6_to_4 \ test_gnunet_vpn-6_over \ - test_gnunet_vpn-4_over + test_gnunet_vpn-4_over endif endif endif @@ -68,47 +68,47 @@ EXTRA_DIST = \ test_gns_vpn_SOURCES = \ test_gns_vpn.c -test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_gns_vpn_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_4_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_4_over_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_6_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_6_over_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_4_to_6_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_4_to_6_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_6_to_4_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_6_to_4_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) 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 HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server endif -if HAVE_LIBCURL +if HAVE_LIBGNURL HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la endif -if HAVE_MHD -if HAVE_LIBCURL +if HAVE_MHD +if HAVE_LIBGNURL HTTP_API_TEST = test_transport_api_http HTTP_REVERSE_API_TEST = test_transport_api_http_reverse HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http @@ -37,9 +37,9 @@ if HAVE_LIBCURL HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https HTTPS_REL_TEST = test_transport_api_reliability_https HTTPS_QUOTA_TEST = test_quota_compliance_https \ - test_quota_compliance_https_asymmetric + test_quota_compliance_https_asymmetric +endif endif -endif if USE_COVERAGE AM_CFLAGS = --coverage -O0 @@ -95,7 +95,7 @@ endif if !MINGW UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la -UNIX_PLUGIN_TEST = test_transport_api_unix +UNIX_PLUGIN_TEST = test_transport_api_unix UNIX_TEST = test_plugin_unix UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix UNIX_REL_TEST = test_transport_api_unreliability_unix @@ -122,7 +122,7 @@ libgnunettransporttesting_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(GN_LIBINTL) + $(GN_LIBINTL) libgnunettransporttesting_la_DEPENDENCIES = \ libgnunettransport.la libgnunettransporttesting_la_LDFLAGS = \ @@ -136,7 +136,7 @@ libgnunettransport_la_SOURCES = \ libgnunettransport_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) + $(GN_LIBINTL) libgnunettransport_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 3:0:1 @@ -145,7 +145,7 @@ libexec_PROGRAMS = \ $(WLAN_BIN) \ $(WLAN_BIN_DUMMY) \ $(BT_BIN) \ - gnunet-service-transport + gnunet-service-transport bin_PROGRAMS = \ gnunet-transport \ @@ -165,30 +165,30 @@ gnunet_helper_transport_wlan_SOURCES = \ gnunet_helper_transport_wlan_dummy_SOURCES = \ gnunet-helper-transport-wlan-dummy.c gnunet_helper_transport_wlan_dummy_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la gnunet_transport_wlan_sender_SOURCES = \ gnunet-transport-wlan-sender.c gnunet_transport_wlan_sender_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la gnunet_transport_wlan_receiver_SOURCES = \ gnunet-transport-wlan-receiver.c gnunet_transport_wlan_receiver_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la gnunet_helper_transport_bluetooth_SOURCES = \ gnunet-helper-transport-bluetooth.c if MINGW gnunet_helper_transport_bluetooth_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la gnunet_helper_transport_bluetooth_LDFLAGS = -lws2_32 else gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth endif gnunet_transport_SOURCES = \ - gnunet-transport.c + gnunet-transport.c gnunet_transport_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/nat/libgnunetnat.la \ @@ -196,7 +196,7 @@ gnunet_transport_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) gnunet_transport_DEPENDENCIES = \ - libgnunettransport.la + libgnunettransport.la gnunet_service_transport_SOURCES = \ gnunet-service-transport.c gnunet-service-transport.h \ @@ -206,7 +206,7 @@ gnunet_service_transport_SOURCES = \ gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ gnunet-service-transport_validation.h gnunet-service-transport_validation.c \ - gnunet-service-transport_manipulation.h gnunet-service-transport_manipulation.c + gnunet-service-transport_manipulation.h gnunet-service-transport_manipulation.c gnunet_service_transport_LDADD = \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/hello/libgnunethello.la \ @@ -258,7 +258,7 @@ libgnunet_plugin_transport_wlan_la_LIBADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_wlan_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) @@ -305,30 +305,30 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ - @LIBCURL@ \ + @LIBGNURL@ \ $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_http_client_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_http_client_la_CFLAGS = \ - $(CFLAGS) + $(CFLAGS) libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) libgnunet_plugin_transport_http_server_la_SOURCES = \ - plugin_transport_http_server.c plugin_transport_http_common.c + plugin_transport_http_server.c plugin_transport_http_common.c libgnunet_plugin_transport_http_server_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_http_server_la_LDFLAGS = \ $(GN_LIBMHD) \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_http_server_la_CFLAGS = \ - $(CFLAGS) + $(CFLAGS) libgnunet_plugin_transport_https_client_la_SOURCES = \ plugin_transport_http_client.c plugin_transport_http_common.c @@ -336,15 +336,15 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ - @LIBCURL@ \ + @LIBGNURL@ \ $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_https_client_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_https_client_la_CFLAGS = \ - $(CFLAGS) -DBUILD_HTTPS + $(CFLAGS) -DBUILD_HTTPS libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) libgnunet_plugin_transport_https_server_la_SOURCES = \ @@ -354,12 +354,12 @@ libgnunet_plugin_transport_https_server_la_LIBADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_https_server_la_LDFLAGS = \ $(GN_LIBMHD) \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_https_server_la_CFLAGS = \ - $(CFLAGS) -DBUILD_HTTPS + $(CFLAGS) -DBUILD_HTTPS if HAVE_TESTING @@ -496,7 +496,7 @@ test_transport_testing_startstop_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_testing_restart_SOURCES = \ test_transport_testing_restart.c @@ -504,7 +504,7 @@ test_transport_testing_restart_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_testing_SOURCES = \ test_transport_testing.c @@ -512,7 +512,7 @@ test_transport_testing_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_blacklisting_SOURCES = \ test_transport_api_blacklisting.c @@ -521,7 +521,7 @@ test_transport_api_blacklisting_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_blacklisting_no_bl_SOURCES = \ test_transport_blacklisting.c @@ -530,8 +530,8 @@ test_transport_blacklisting_no_bl_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - + $(top_builddir)/src/transport/libgnunettransporttesting.la + test_transport_blacklisting_outbound_bl_full_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_outbound_bl_full_LDADD = \ @@ -539,8 +539,8 @@ test_transport_blacklisting_outbound_bl_full_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - + $(top_builddir)/src/transport/libgnunettransporttesting.la + test_transport_blacklisting_outbound_bl_plugin_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_outbound_bl_plugin_LDADD = \ @@ -548,7 +548,7 @@ test_transport_blacklisting_outbound_bl_plugin_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_blacklisting_inbound_bl_full_SOURCES = \ test_transport_blacklisting.c @@ -557,8 +557,8 @@ test_transport_blacklisting_inbound_bl_full_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - + $(top_builddir)/src/transport/libgnunettransporttesting.la + test_transport_blacklisting_inbound_bl_plugin_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_inbound_bl_plugin_LDADD = \ @@ -566,7 +566,7 @@ test_transport_blacklisting_inbound_bl_plugin_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_blacklisting_multiple_plugins_SOURCES = \ test_transport_blacklisting.c @@ -575,7 +575,7 @@ test_transport_blacklisting_multiple_plugins_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_disconnect_tcp_SOURCES = \ @@ -585,7 +585,7 @@ test_transport_api_disconnect_tcp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_startonly_SOURCES = \ test_transport_startonly.c @@ -594,7 +594,7 @@ test_transport_startonly_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_plugin_tcp_SOURCES = \ test_plugin_transport.c @@ -630,7 +630,7 @@ test_plugin_wlan_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_plugin_bluetooth_SOURCES = \ test_plugin_transport.c @@ -639,7 +639,7 @@ test_plugin_bluetooth_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_http_common_SOURCES = \ test_http_common.c plugin_transport_http_common.c @@ -648,7 +648,7 @@ test_http_common_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_plugin_http_server_SOURCES = \ test_plugin_transport.c @@ -657,7 +657,7 @@ test_plugin_http_server_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_plugin_https_server_SOURCES = \ test_plugin_transport.c @@ -675,7 +675,7 @@ test_plugin_http_client_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_plugin_https_client_SOURCES = \ test_plugin_transport.c @@ -684,7 +684,7 @@ test_plugin_https_client_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_tcp_SOURCES = \ test_transport_api.c @@ -709,7 +709,7 @@ test_transport_api_restart_1peer_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_restart_2peers_SOURCES = \ test_transport_api_restart_2peers.c @@ -718,7 +718,7 @@ test_transport_api_restart_2peers_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_limited_sockets_tcp_SOURCES = \ test_transport_api_limited_sockets.c @@ -734,7 +734,7 @@ test_transport_api_tcp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_manipulation_send_tcp_SOURCES = \ test_transport_api_manipulation_send_tcp.c @@ -742,7 +742,7 @@ test_transport_api_manipulation_send_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_manipulation_recv_tcp_SOURCES = \ test_transport_api_manipulation_recv_tcp.c @@ -750,7 +750,7 @@ test_transport_api_manipulation_recv_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_manipulation_cfg_SOURCES = \ test_transport_api_manipulation_cfg.c @@ -758,7 +758,7 @@ test_transport_api_manipulation_cfg_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la @@ -768,7 +768,7 @@ test_transport_api_reliability_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_timeout_tcp_SOURCES = \ test_transport_api_timeout.c @@ -776,7 +776,7 @@ test_transport_api_timeout_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_timeout_unix_SOURCES = \ test_transport_api_timeout.c @@ -784,7 +784,7 @@ test_transport_api_timeout_unix_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_reliability_tcp_nat_SOURCES = \ test_transport_api_reliability.c @@ -792,7 +792,7 @@ test_transport_api_reliability_tcp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_reliability_wlan_SOURCES = \ test_transport_api_reliability.c @@ -808,7 +808,7 @@ test_transport_api_reliability_bluetooth_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_unreliability_wlan_SOURCES = \ test_transport_api_unreliability.c @@ -816,7 +816,7 @@ test_transport_api_unreliability_wlan_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_unreliability_bluetooth_SOURCES = \ test_transport_api_unreliability.c @@ -824,7 +824,7 @@ test_transport_api_unreliability_bluetooth_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_udp_SOURCES = \ test_transport_api.c @@ -840,7 +840,7 @@ test_transport_api_timeout_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_udp_nat_SOURCES = \ test_transport_api.c @@ -848,7 +848,7 @@ test_transport_api_udp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_unix_SOURCES = \ test_transport_api.c @@ -856,7 +856,7 @@ test_transport_api_unix_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la # HTTP tests test_transport_api_http_SOURCES = \ @@ -881,7 +881,7 @@ test_transport_api_timeout_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_reliability_http_SOURCES = \ test_transport_api_reliability.c @@ -889,7 +889,7 @@ test_transport_api_reliability_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_quota_compliance_http_SOURCES = \ test_quota_compliance.c @@ -897,7 +897,7 @@ test_quota_compliance_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_quota_compliance_http_asymmetric_SOURCES = \ test_quota_compliance.c @@ -930,7 +930,7 @@ test_transport_api_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_timeout_https_SOURCES = \ test_transport_api_timeout.c @@ -938,7 +938,7 @@ test_transport_api_timeout_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_reliability_https_SOURCES = \ @@ -947,7 +947,7 @@ test_transport_api_reliability_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_unreliability_unix_SOURCES = \ test_transport_api_unreliability.c @@ -955,7 +955,7 @@ test_transport_api_unreliability_unix_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_unreliability_udp_SOURCES = \ test_transport_api_unreliability.c @@ -963,7 +963,7 @@ test_transport_api_unreliability_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_transport_api_unreliability_constant_udp_SOURCES = \ test_transport_api_unreliability_constant.c @@ -971,7 +971,7 @@ test_transport_api_unreliability_constant_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la if LINUX test_transport_api_wlan_SOURCES = \ @@ -980,7 +980,7 @@ test_transport_api_wlan_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la endif if LINUX @@ -991,7 +991,7 @@ test_transport_api_bluetooth_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la endif endif @@ -1001,7 +1001,7 @@ test_quota_compliance_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_quota_compliance_tcp_asymmetric_SOURCES = \ test_quota_compliance.c @@ -1009,7 +1009,7 @@ test_quota_compliance_tcp_asymmetric_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la test_quota_compliance_udp_SOURCES = \ test_quota_compliance.c @@ -1073,7 +1073,7 @@ test_transport_api_multi_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la EXTRA_DIST = \ @@ -1186,4 +1186,4 @@ test_transport_blacklisting_cfg_blp_peer2_plugin.conf \ test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf \ test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf \ test_transport_api_http_reverse_peer1.conf \ -test_transport_api_http_reverse_peer2.conf +test_transport_api_http_reverse_peer2.conf -- cgit v1.2.3