aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HACKING40
-rw-r--r--TODO1
-rw-r--r--configure.ac90
-rw-r--r--m4/libcurl.m4109
-rw-r--r--src/arm/Makefile.am2
-rw-r--r--src/chat/Makefile.am2
-rw-r--r--src/core/Makefile.am2
-rw-r--r--src/datacache/Makefile.am20
-rw-r--r--src/datastore/Makefile.am26
-rw-r--r--src/dht/Makefile.am2
-rw-r--r--src/dv/Makefile.am2
-rw-r--r--src/fragmentation/Makefile.am2
-rw-r--r--src/fs/Makefile.am16
-rw-r--r--src/hello/Makefile.am2
-rw-r--r--src/hostlist/Makefile.am2
-rw-r--r--src/monkey/Makefile.am2
-rw-r--r--src/peerinfo-tool/Makefile.am2
-rw-r--r--src/peerinfo/Makefile.am8
-rw-r--r--src/statistics/Makefile.am2
-rw-r--r--src/template/Makefile.am2
-rw-r--r--src/testing/Makefile.am2
-rw-r--r--src/topology/Makefile.am2
-rw-r--r--src/transport/Makefile.am8
-rw-r--r--src/util/Makefile.am9
-rw-r--r--src/vpn/Makefile.am2
25 files changed, 217 insertions, 140 deletions
diff --git a/HACKING b/HACKING
index 511a88060..535d4498f 100644
--- a/HACKING
+++ b/HACKING
@@ -13,6 +13,7 @@ include files:
13 * gnunet_directories.h --- generated 13 * gnunet_directories.h --- generated
14 * gettext.h --- external library 14 * gettext.h --- external library
15 15
16
16configuration: 17configuration:
17- paths (that are substituted in all filenames) are in PATHS (have as few as possible) 18- paths (that are substituted in all filenames) are in PATHS (have as few as possible)
18- globals for the daemon are in [gnunetd] (for now, have as few as possible!) 19- globals for the daemon are in [gnunetd] (for now, have as few as possible!)
@@ -22,11 +23,11 @@ configuration:
22 together with the options for the testing module itself 23 together with the options for the testing module itself
23 24
24 25
25
26exported symbols: 26exported symbols:
27- must start with "GNUNET_modulename_" and be defined in "modulename.c" 27- must start with "GNUNET_modulename_" and be defined in "modulename.c"
28- exceptions: those defined in gnunet_common.h 28- exceptions: those defined in gnunet_common.h
29 29
30
30private (library-internal) symbols (including structs & macros): 31private (library-internal) symbols (including structs & macros):
31- must NOT start with any prefix 32- must NOT start with any prefix
32- must not be exported in a way that linkers could use them or 33- must not be exported in a way that linkers could use them or
@@ -43,7 +44,7 @@ testcases:
43performance tests: 44performance tests:
44- must be called "perf_module-under-test_case-description.c" 45- must be called "perf_module-under-test_case-description.c"
45- "case-description" maybe omitted if there is only one performance test 46- "case-description" maybe omitted if there is only one performance test
46 47- Must only be run if HAVE_BENCHMARKS is satisfied
47 48
48 49
49src/ directories: 50src/ directories:
@@ -54,22 +55,6 @@ src/ directories:
54- libgnunet_plugin_DIR_NAME: loadable plugins (i.e., libgnunet_plugin_transport_tcp) 55- libgnunet_plugin_DIR_NAME: loadable plugins (i.e., libgnunet_plugin_transport_tcp)
55 56
56 57
57
58Minimum file-sharing system (in order of dependency):
59gnunet-service-arm
60gnunet-service-transport
61gnunet-service-core
62gnunet-daemon-hostlist
63gnunet-daemon-topology
64gnunet-service-statistics
65gnunet-service-datastore
66gnunet-service-datacache
67gnunet-service-dht
68gnunet-service-fs (or just lib?)
69
70
71
72
73Coding style: 58Coding style:
74- GNU guidelines apply 59- GNU guidelines apply
75- declare only one variable per line, so 60- declare only one variable per line, so
@@ -82,7 +67,6 @@ Coding style:
82 int i,j; 67 int i,j;
83 68
84 69
85
86Build-system: 70Build-system:
87 71
88If you have code that is likely not to compile or build rules you might want to not 72If you have code that is likely not to compile or build rules you might want to not
@@ -92,6 +76,24 @@ it is OK to (temporarily) add non-compiling (or known-to-not-port) code.
92If you want to compile all testcases but NOT run them, run configure with the 76If you want to compile all testcases but NOT run them, run configure with the
93--enable-test-suppression option. 77--enable-test-suppression option.
94 78
79If you want to run all testcases, including those that take a while, run configure with the
80--enable-expensive-testcases option.
81
82If you want to compile and run benchmarks, run configure with the
83--enable-benchmarks option.
84
95If you want to obtain code coverage results, run configure with the 85If you want to obtain code coverage results, run configure with the
96--enable-coverage option and run the coverage.sh script in contrib/. 86--enable-coverage option and run the coverage.sh script in contrib/.
97 87
88
89Minimum file-sharing system (in order of dependency):
90gnunet-service-arm
91gnunet-service-transport
92gnunet-service-core
93gnunet-daemon-hostlist
94gnunet-daemon-topology
95gnunet-service-statistics
96gnunet-service-datastore
97gnunet-service-datacache
98gnunet-service-dht
99gnunet-service-fs
diff --git a/TODO b/TODO
index b591310cb..9bfde8893 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
10.9.0pre3: 10.9.0pre3:
2* clean buildbots 2* clean buildbots
3* clean build
4 3
50.9.0: 40.9.0:
6* new webpage: 5* new webpage:
diff --git a/configure.ac b/configure.ac
index 815c040b0..b720be535 100644
--- a/configure.ac
+++ b/configure.ac
@@ -714,61 +714,87 @@ AC_SUBST(EXT_LIB_PATH)
714 714
715# should 'make check' run tests? 715# should 'make check' run tests?
716AC_MSG_CHECKING(whether to run tests) 716AC_MSG_CHECKING(whether to run tests)
717AC_ARG_ENABLE(testruns, 717AC_ARG_ENABLE([testruns],
718 [AS_HELP_STRING([--enable-testruns=yes/no], 718 [AS_HELP_STRING([--disable-testruns], [disable running tests on make check (default is YES)])],
719 [disable running tests on make check (default is YES)])], 719 [enable_tests_run=${enableval}],
720 [enable_tests_run=$enableval], 720 [enable_tests_run=yes])
721 [enable_tests_run="yes"])
722AC_MSG_RESULT($enable_test_run) 721AC_MSG_RESULT($enable_test_run)
723AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$enable_tests_run" = "xno"]) 722AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"])
723
724# should expensive tests be run?
725AC_MSG_CHECKING(whether to run expensive tests)
726AC_ARG_ENABLE([expensivetests],
727 [AS_HELP_STRING([--enable-expensive-tests], [enable running expensive testcases])],
728 [enable_expensive=${enableval}],
729 [enable_expensive=no])
730AC_MSG_RESULT($enable_expensive)
731AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [test "x$enable_expensive" = "xyes"])
732
733# should benchmarks be run?
734AC_MSG_CHECKING(whether to run benchmarks during make check)
735AC_ARG_ENABLE([benchmarks],
736 [AS_HELP_STRING([--enable-benchmarks], [enable running benchmarks during make check])],
737 [enable_benchmarks=${enableval}],
738 [enable_benchmarks=no])
739AC_MSG_RESULT($enable_benchmarks)
740AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
724 741
725# should experimental code be compiled (code that may not yet compile)? 742# should experimental code be compiled (code that may not yet compile)?
726disable_experimental=yes
727AC_MSG_CHECKING(whether to compile experimental code) 743AC_MSG_CHECKING(whether to compile experimental code)
728AC_ARG_ENABLE(experimental, 744AC_ARG_ENABLE([experimental],
729 [AS_HELP_STRING([--enable-experimental], 745 [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])],
730 [enable compiling experimental code])], 746 [enable_experimental=${enableval}],
731 [enable_experimental=$enableval], 747 [enable_experimental=no])
732 [enable_experimental="no"])
733AC_MSG_RESULT($enable_experimental) 748AC_MSG_RESULT($enable_experimental)
734AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) 749AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
735 750
736# should malicious code be compiled (code used for testing with malicious peers) 751# should malicious code be compiled (code used for testing with malicious peers)
737enable_malicious=0
738AC_MSG_CHECKING(whether to compile malicious code) 752AC_MSG_CHECKING(whether to compile malicious code)
739AC_ARG_ENABLE(malicious, 753AC_ARG_ENABLE([malicious],
740 [AS_HELP_STRING([--enable-malicious], 754 [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code (only for developers for testing)])],
741 [enable compiling malicious code (only for developers for testing)])], 755 [enable_malicious=${enableval}],
742 [enable_malicious=1], 756 [enable_malicious=no])
743 [enable_malicious=0])
744AC_MSG_RESULT($enable_malicious) 757AC_MSG_RESULT($enable_malicious)
745AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"]) 758AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "xyes"])
746AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code]) 759if test "$enable_malicious" = "yes"
760then
761 AC_DEFINE([HAVE_MALICIOUS],[1],[include malicious code])
762else
763 AC_DEFINE([HAVE_MALICIOUS],[0],[disable malicious code])
764fi
747 765
748# should code be enabled that works around missing OS functionality on Windows? 766# should code be enabled that works around missing OS functionality on Windows?
749# used for test cases 767# used for test cases
750AC_ARG_ENABLE(windows_workarounds, [AS_HELP_STRING([--enable-windows_workarounds],
751 [enable workarounds used on Windows (only useful for test cases)])])
752if test $build_target = "mingw" 768if test $build_target = "mingw"
753then 769then
754 workarounds=1 770 workarounds=1
755else 771else
756 if test x$enable_windows_workarounds = "xyes" 772 AC_MSG_CHECKING(whether to enable windows workarounds)
757 then 773 AC_ARG_ENABLE([windows_workarounds],
758 workarounds=1 774 [AS_HELP_STRING([--enable-windows_workarounds], [enable workarounds used on Windows (only useful for test cases)])],
759 else 775 [enable_workarounds=${enableval}],
760 workarounds=0 776 [enable_workarounds=no])
761 fi 777 AC_MSG_RESULT($enable_workarounds)
778 if test x$enable_windows_workarounds = "xyes"
779 then
780 workarounds=1
781 else
782 workarounds=0
783 fi
762fi 784fi
763AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workarounds used on Windows (only useful for test cases)]) 785AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workarounds used on Windows (only useful for test cases)])
764 786
765# gcov compilation 787# gcov compilation
766use_gcov=no 788AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
767AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], 789AC_ARG_ENABLE([coverage],
768 [Compile the library with code coverage support (default is NO)]), 790 AS_HELP_STRING([--enable-coverage],
769 [use_gcov=yes], [use_gcov=no]) 791 [compile the library with code coverage support]),
792 [use_gcov=${enableval}],
793 [use_gcov=no])
794AC_MSG_RESULT($use_gcov)
770AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) 795AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
771 796
797
772AC_CONFIG_FILES([ 798AC_CONFIG_FILES([
773Makefile 799Makefile
774contrib/Makefile 800contrib/Makefile
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index a9bfa2e23..01a0575cc 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -55,9 +55,13 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
55 AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) 55 AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
56 AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) 56 AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
57 AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP]) 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])
58 62
59 AC_ARG_WITH(libcurl, 63 AC_ARG_WITH(libcurl,
60 AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), 64 AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
61 [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) 65 [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
62 66
63 if test "$_libcurl_with" != "no" ; then 67 if test "$_libcurl_with" != "no" ; then
@@ -71,32 +75,33 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
71 if test -d "$_libcurl_with" ; then 75 if test -d "$_libcurl_with" ; then
72 LIBCURL_CPPFLAGS="-I$withval/include" 76 LIBCURL_CPPFLAGS="-I$withval/include"
73 _libcurl_ldflags="-L$withval/lib" 77 _libcurl_ldflags="-L$withval/lib"
74 AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"]) 78 AC_PATH_PROG([_libcurl_config],[curl-config],[],
79 ["$withval/bin"])
75 else 80 else
76 AC_PATH_PROG([_libcurl_config],[curl-config]) 81 AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH])
77 fi 82 fi
78 83
79 if test x$_libcurl_config != "x" ; then 84 if test x$_libcurl_config != "x" ; then
80 AC_CACHE_CHECK([for the version of libcurl], 85 AC_CACHE_CHECK([for the version of libcurl],
81 [libcurl_cv_lib_curl_version], 86 [libcurl_cv_lib_curl_version],
82 [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) 87 [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
83 88
84 _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` 89 _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
85 _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` 90 _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
86 91
87 if test $_libcurl_wanted -gt 0 ; then 92 if test $_libcurl_wanted -gt 0 ; then
88 AC_CACHE_CHECK([for libcurl >= version $2], 93 AC_CACHE_CHECK([for libcurl >= version $2],
89 [libcurl_cv_lib_version_ok], 94 [libcurl_cv_lib_version_ok],
90 [ 95 [
91 if test $_libcurl_version -ge $_libcurl_wanted ; then 96 if test $_libcurl_version -ge $_libcurl_wanted ; then
92 libcurl_cv_lib_version_ok=yes 97 libcurl_cv_lib_version_ok=yes
93 else 98 else
94 libcurl_cv_lib_version_ok=no 99 libcurl_cv_lib_version_ok=no
95 fi 100 fi
96 ]) 101 ])
97 fi 102 fi
98 103
99 if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then 104 if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
100 if test x"$LIBCURL_CPPFLAGS" = "x" ; then 105 if test x"$LIBCURL_CPPFLAGS" = "x" ; then
101 LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` 106 LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
102 fi 107 fi
@@ -104,8 +109,8 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
104 LIBCURL=`$_libcurl_config --libs` 109 LIBCURL=`$_libcurl_config --libs`
105 110
106 # This is so silly, but Apple actually has a bug in their 111 # This is so silly, but Apple actually has a bug in their
107 # curl-config script. Fixed in Tiger, but there are still 112 # curl-config script. Fixed in Tiger, but there are still
108 # lots of Panther installs around. 113 # lots of Panther installs around.
109 case "${host}" in 114 case "${host}" in
110 powerpc-apple-darwin7*) 115 powerpc-apple-darwin7*)
111 LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` 116 LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
@@ -113,18 +118,18 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
113 esac 118 esac
114 fi 119 fi
115 120
116 # All curl-config scripts support --feature 121 # All curl-config scripts support --feature
117 _libcurl_features=`$_libcurl_config --feature` 122 _libcurl_features=`$_libcurl_config --feature`
118 123
119 # Is it modern enough to have --protocols? (7.12.4) 124 # Is it modern enough to have --protocols? (7.12.4)
120 if test $_libcurl_version -ge 461828 ; then 125 if test $_libcurl_version -ge 461828 ; then
121 _libcurl_protocols=`$_libcurl_config --protocols` 126 _libcurl_protocols=`$_libcurl_config --protocols`
122 fi 127 fi
123 else 128 else
124 _libcurl_try_link=no 129 _libcurl_try_link=no
125 fi 130 fi
126 131
127 unset _libcurl_wanted 132 unset _libcurl_wanted
128 fi 133 fi
129 134
130 if test $_libcurl_try_link = yes ; then 135 if test $_libcurl_try_link = yes ; then
@@ -141,7 +146,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
141 _libcurl_save_libs=$LIBS 146 _libcurl_save_libs=$LIBS
142 LIBS="$LIBCURL $LIBS" 147 LIBS="$LIBCURL $LIBS"
143 148
144 AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[ 149 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[
145/* Try and use a few common options to force a failure if we are 150/* Try and use a few common options to force a failure if we are
146 missing symbols or can't link. */ 151 missing symbols or can't link. */
147int x; 152int x;
@@ -152,7 +157,7 @@ x=CURLOPT_FILE;
152x=CURLOPT_ERRORBUFFER; 157x=CURLOPT_ERRORBUFFER;
153x=CURLOPT_STDERR; 158x=CURLOPT_STDERR;
154x=CURLOPT_VERBOSE; 159x=CURLOPT_VERBOSE;
155]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) 160])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
156 161
157 CPPFLAGS=$_libcurl_save_cppflags 162 CPPFLAGS=$_libcurl_save_cppflags
158 LIBS=$_libcurl_save_libs 163 LIBS=$_libcurl_save_libs
@@ -162,8 +167,8 @@ x=CURLOPT_VERBOSE;
162 167
163 if test $libcurl_cv_lib_curl_usable = yes ; then 168 if test $libcurl_cv_lib_curl_usable = yes ; then
164 169
165 # Does curl_free() exist in this version of libcurl? 170 # Does curl_free() exist in this version of libcurl?
166 # If not, fake it with free() 171 # If not, fake it with free()
167 172
168 _libcurl_save_cppflags=$CPPFLAGS 173 _libcurl_save_cppflags=$CPPFLAGS
169 CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" 174 CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
@@ -171,8 +176,8 @@ x=CURLOPT_VERBOSE;
171 LIBS="$LIBS $LIBCURL" 176 LIBS="$LIBS $LIBCURL"
172 177
173 AC_CHECK_FUNC(curl_free,, 178 AC_CHECK_FUNC(curl_free,,
174 AC_DEFINE(curl_free,free, 179 AC_DEFINE(curl_free,free,
175 [Define curl_free() as free() if our version of curl lacks curl_free.])) 180 [Define curl_free() as free() if our version of curl lacks curl_free.]))
176 181
177 CPPFLAGS=$_libcurl_save_cppflags 182 CPPFLAGS=$_libcurl_save_cppflags
178 LIBS=$_libcurl_save_libs 183 LIBS=$_libcurl_save_libs
@@ -185,34 +190,40 @@ x=CURLOPT_VERBOSE;
185 AC_SUBST(LIBCURL) 190 AC_SUBST(LIBCURL)
186 191
187 for _libcurl_feature in $_libcurl_features ; do 192 for _libcurl_feature in $_libcurl_features ; do
188 AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1]) 193 AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
189 eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes 194 eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
190 done 195 done
191 196
192 if test "x$_libcurl_protocols" = "x" ; then 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"
193 202
194 # We don't have --protocols, so just assume that all 203 if test x$libcurl_feature_SSL = xyes ; then
195 # protocols are available 204 _libcurl_protocols="$_libcurl_protocols HTTPS"
196 _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT"
197 205
198 if test x$libcurl_feature_SSL = xyes ; then 206 # FTPS wasn't standards-compliant until version
199 _libcurl_protocols="$_libcurl_protocols HTTPS" 207 # 7.11.0 (0x070b00 == 461568)
208 if test $_libcurl_version -ge 461568; then
209 _libcurl_protocols="$_libcurl_protocols FTPS"
210 fi
211 fi
200 212
201 # FTPS wasn't standards-compliant until version 213 # RTSP, IMAP, POP3 and SMTP were added in
202 # 7.11.0 214 # 7.20.0 (0x071400 == 463872)
203 if test $_libcurl_version -ge 461568; then 215 if test $_libcurl_version -ge 463872; then
204 _libcurl_protocols="$_libcurl_protocols FTPS" 216 _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP"
205 fi 217 fi
206 fi 218 fi
207 fi
208 219
209 for _libcurl_protocol in $_libcurl_protocols ; do 220 for _libcurl_protocol in $_libcurl_protocols ; do
210 AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) 221 AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
211 eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes 222 eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
212 done 223 done
213 else 224 else
214 unset LIBCURL 225 unset LIBCURL
215 unset LIBCURL_CPPFLAGS 226 unset LIBCURL_CPPFLAGS
216 fi 227 fi
217 fi 228 fi
218 229
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 3e7f27dfd..bd6e7e0e7 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -59,7 +59,7 @@ check_PROGRAMS = \
59check_SCRIPTS = \ 59check_SCRIPTS = \
60 test_gnunet_arm.sh 60 test_gnunet_arm.sh
61 61
62if !DISABLE_TEST_RUN 62if ENABLE_TEST_RUN
63TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 63TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
64endif 64endif
65 65
diff --git a/src/chat/Makefile.am b/src/chat/Makefile.am
index f10796c23..39a2df2a1 100644
--- a/src/chat/Makefile.am
+++ b/src/chat/Makefile.am
@@ -50,7 +50,7 @@ check_PROGRAMS = \
50 test_chat_private \ 50 test_chat_private \
51 test_chat_private_p2p 51 test_chat_private_p2p
52 52
53if !DISABLE_TEST_RUN 53if ENABLE_TEST_RUN
54TESTS = $(check_PROGRAMS) 54TESTS = $(check_PROGRAMS)
55endif 55endif
56 56
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 1ab88033f..2faeb2357 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -47,7 +47,7 @@ check_PROGRAMS = \
47 test_core_quota_compliance_asymmetric_recv_limited \ 47 test_core_quota_compliance_asymmetric_recv_limited \
48 test_core_api_send_to_self 48 test_core_api_send_to_self
49 49
50if !DISABLE_TEST_RUN 50if ENABLE_TEST_RUN
51TESTS = $(check_PROGRAMS) 51TESTS = $(check_PROGRAMS)
52endif 52endif
53 53
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 5e3919820..921d88e5f 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -81,24 +81,36 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \
81 81
82 82
83if HAVE_SQLITE 83if HAVE_SQLITE
84if HAVE_BENCHMARKS
85 SQLITE_BENCHMARKS = \
86 perf_datacache_postgres
87endif
84SQLITE_TESTS = \ 88SQLITE_TESTS = \
85 test_datacache_sqlite \ 89 test_datacache_sqlite \
86 test_datacache_quota_sqlite \ 90 test_datacache_quota_sqlite \
87 perf_datacache_sqlite 91 $(SQLITE_BENCHMARKS)
88endif 92endif
89 93
90if HAVE_MYSQL 94if HAVE_MYSQL
95if HAVE_BENCHMARKS
96 MYSQL_BENCHMARKS = \
97 perf_datacache_postgres
98endif
91MYSQL_TESTS = \ 99MYSQL_TESTS = \
92 test_datacache_mysql \ 100 test_datacache_mysql \
93 test_datacache_quota_mysql \ 101 test_datacache_quota_mysql \
94 perf_datacache_mysql 102 $(MYSQL_BENCHMARKS)
95endif 103endif
96 104
97if HAVE_POSTGRES 105if HAVE_POSTGRES
106if HAVE_BENCHMARKS
107 POSTGRES_BENCHMARKS = \
108 perf_datacache_postgres
109endif
98POSTGRES_TESTS = \ 110POSTGRES_TESTS = \
99 test_datacache_postgres \ 111 test_datacache_postgres \
100 test_datacache_quota_postgres \ 112 test_datacache_quota_postgres \
101 perf_datacache_postgres 113 $(POSTGRES_BENCHMARKS)
102endif 114endif
103 115
104check_PROGRAMS = \ 116check_PROGRAMS = \
@@ -106,7 +118,7 @@ check_PROGRAMS = \
106 $(MYSQL_TESTS) \ 118 $(MYSQL_TESTS) \
107 $(POSTGRES_TESTS) 119 $(POSTGRES_TESTS)
108 120
109if !DISABLE_TEST_RUN 121if ENABLE_TEST_RUN
110TESTS = $(check_PROGRAMS) 122TESTS = $(check_PROGRAMS)
111endif 123endif
112 124
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 4ab887061..a3c484531 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -38,30 +38,42 @@ gnunet_service_datastore_LDADD = \
38 38
39if HAVE_MYSQL 39if HAVE_MYSQL
40 MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la 40 MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la
41if HAVE_BENCHMARKS
42 MYSQL_BENCHMARKS = \
43 perf_datastore_api_mysql \
44 perf_plugin_datastore_mysql
45endif
41 MYSQL_TESTS = \ 46 MYSQL_TESTS = \
42 test_datastore_api_mysql \ 47 test_datastore_api_mysql \
43 test_datastore_api_management_mysql \ 48 test_datastore_api_management_mysql \
44 test_plugin_datastore_mysql \ 49 test_plugin_datastore_mysql \
45 perf_datastore_api_mysql \ 50 $(MYSQL_BENCHMARKS)
46 perf_plugin_datastore_mysql
47endif 51endif
48if HAVE_SQLITE 52if HAVE_SQLITE
49 SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la 53 SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
54if HAVE_BENCHMARKS
55 SQLITE_BENCHMARKS = \
56 perf_datastore_api_sqlite \
57 perf_plugin_datastore_sqlite
58endif
50 SQLITE_TESTS = \ 59 SQLITE_TESTS = \
51 test_datastore_api_sqlite \ 60 test_datastore_api_sqlite \
52 test_datastore_api_management_sqlite \ 61 test_datastore_api_management_sqlite \
53 test_plugin_datastore_sqlite \ 62 test_plugin_datastore_sqlite \
54 perf_datastore_api_sqlite \ 63 $(SQLITE_BENCHMARKS)
55 perf_plugin_datastore_sqlite
56endif 64endif
57if HAVE_POSTGRES 65if HAVE_POSTGRES
58 POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la 66 POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
67if HAVE_BENCHMARKS
68 POSTGRES_BENCHMARKS = \
69 perf_datastore_api_postgres \
70 perf_plugin_datastore_postgres
71endif
59 POSTGRES_TESTS = \ 72 POSTGRES_TESTS = \
60 test_datastore_api_postgres \ 73 test_datastore_api_postgres \
61 test_datastore_api_management_postgres \ 74 test_datastore_api_management_postgres \
62 test_plugin_datastore_postgres \ 75 test_plugin_datastore_postgres \
63 perf_datastore_api_postgres \ 76 $(POSTGRES_BENCHMARKS)
64 perf_plugin_datastore_postgres
65endif 77endif
66 78
67plugin_LTLIBRARIES = \ 79plugin_LTLIBRARIES = \
@@ -113,7 +125,7 @@ check_PROGRAMS = \
113 $(MYSQL_TESTS) \ 125 $(MYSQL_TESTS) \
114 $(POSTGRES_TESTS) 126 $(POSTGRES_TESTS)
115 127
116if !DISABLE_TEST_RUN 128if ENABLE_TEST_RUN
117TESTS = $(check_PROGRAMS) 129TESTS = $(check_PROGRAMS)
118endif 130endif
119 131
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 97f81e6be..11ab7ca8b 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -156,7 +156,7 @@ check_PROGRAMS = \
156 test_dhtlog 156 test_dhtlog
157# test_hash_operations 157# test_hash_operations
158 158
159if !DISABLE_TEST_RUN 159if ENABLE_TEST_RUN
160TESTS = test_dht_api $(check_SCRIPTS) \ 160TESTS = test_dht_api $(check_SCRIPTS) \
161 test_dht_twopeer \ 161 test_dht_twopeer \
162 test_dht_twopeer_put_get \ 162 test_dht_twopeer_put_get \
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 9e7d9c4e4..d505e31c4 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -58,7 +58,7 @@ check_PROGRAMS = \
58 test_transport_api_dv 58 test_transport_api_dv
59# test_dv_topology 59# test_dv_topology
60 60
61if !DISABLE_TEST_RUN 61if ENABLE_TEST_RUN
62TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 62TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
63endif 63endif
64 64
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index f00c0958c..5b1367260 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -18,7 +18,7 @@ libgnunetfragmentation_la_LIBADD = \
18check_PROGRAMS = \ 18check_PROGRAMS = \
19 test_fragmentation 19 test_fragmentation
20 20
21if !DISABLE_TEST_RUN 21if ENABLE_TEST_RUN
22TESTS = $(check_PROGRAMS) 22TESTS = $(check_PROGRAMS)
23endif 23endif
24 24
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index d433e5b66..39dce602e 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -134,8 +134,13 @@ gnunet_unindex_LDADD = \
134gnunet_unindex_DEPENDENCIES = \ 134gnunet_unindex_DEPENDENCIES = \
135 libgnunetfs.la 135 libgnunetfs.la
136 136
137 137if HAVE_BENCHMARKS
138 138 FS_BENCHMARKS = \
139 perf_gnunet_service_fs_p2p \
140 perf_gnunet_service_fs_p2p_dht \
141 perf_gnunet_service_fs_p2p_index \
142 perf_gnunet_service_fs_p2p_trust
143endif
139 144
140check_PROGRAMS = \ 145check_PROGRAMS = \
141 test_fs_directory \ 146 test_fs_directory \
@@ -158,10 +163,7 @@ check_PROGRAMS = \
158 test_fs_uri \ 163 test_fs_uri \
159 test_gnunet_service_fs_migration \ 164 test_gnunet_service_fs_migration \
160 test_gnunet_service_fs_p2p \ 165 test_gnunet_service_fs_p2p \
161 perf_gnunet_service_fs_p2p \ 166 $(FS_BENCHMARKS)
162 perf_gnunet_service_fs_p2p_dht \
163 perf_gnunet_service_fs_p2p_index \
164 perf_gnunet_service_fs_p2p_trust
165 167
166 168
167if HAVE_PYTHON_PEXPECT 169if HAVE_PYTHON_PEXPECT
@@ -173,7 +175,7 @@ check_SCRIPTS = \
173endif 175endif
174 176
175 177
176if !DISABLE_TEST_RUN 178if ENABLE_TEST_RUN
177TESTS = \ 179TESTS = \
178 test_fs_directory \ 180 test_fs_directory \
179 test_fs_download \ 181 test_fs_download \
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index 703776c65..c2bc5cd69 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -19,7 +19,7 @@ libgnunethello_la_LIBADD = \
19check_PROGRAMS = \ 19check_PROGRAMS = \
20 test_hello 20 test_hello
21 21
22if !DISABLE_TEST_RUN 22if ENABLE_TEST_RUN
23TESTS = $(check_PROGRAMS) 23TESTS = $(check_PROGRAMS)
24endif 24endif
25 25
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 560d81900..15c8f86a7 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -37,7 +37,7 @@ check_PROGRAMS = \
37 test_gnunet_daemon_hostlist_learning 37 test_gnunet_daemon_hostlist_learning
38 38
39if HAVE_MHD 39if HAVE_MHD
40if !DISABLE_TEST_RUN 40if ENABLE_TEST_RUN
41TESTS = \ 41TESTS = \
42 test_gnunet_daemon_hostlist \ 42 test_gnunet_daemon_hostlist \
43 test_gnunet_daemon_hostlist_reconnect \ 43 test_gnunet_daemon_hostlist_reconnect \
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am
index b1d6cb89b..4b170da58 100644
--- a/src/monkey/Makefile.am
+++ b/src/monkey/Makefile.am
@@ -92,7 +92,7 @@ check_PROGRAMS = \
92 test_monkey_edb 92 test_monkey_edb
93 #test_gnunet_monkey 93 #test_gnunet_monkey
94 94
95if !DISABLE_TEST_RUN 95if ENABLE_TEST_RUN
96# TESTS = $(check_SCRIPTS) 96# TESTS = $(check_SCRIPTS)
97TESTS = $(check_PROGRAMS) 97TESTS = $(check_PROGRAMS)
98endif 98endif
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index b004a4732..8c5fd8fbb 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -25,7 +25,7 @@ check_SCRIPTS = \
25 test_gnunet_peerinfo.py 25 test_gnunet_peerinfo.py
26endif 26endif
27 27
28if !DISABLE_TEST_RUN 28if ENABLE_TEST_RUN
29TESTS = $(check_SCRIPTS) 29TESTS = $(check_SCRIPTS)
30endif 30endif
31 31
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 116095f2a..d58425730 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -33,12 +33,16 @@ gnunet_service_peerinfo_LDADD = \
33 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 33 $(top_builddir)/src/statistics/libgnunetstatistics.la \
34 $(top_builddir)/src/util/libgnunetutil.la 34 $(top_builddir)/src/util/libgnunetutil.la
35 35
36if HAVE_BENCHMARKS
37 PEERINFO_BENCHMARKS = \
38 perf_peerinfo_api
39endif
36 40
37check_PROGRAMS = \ 41check_PROGRAMS = \
38 test_peerinfo_api \ 42 test_peerinfo_api \
39 perf_peerinfo_api 43 $(PEERINFO_BENCHMARKS)
40 44
41if !DISABLE_TEST_RUN 45if ENABLE_TEST_RUN
42TESTS = $(check_PROGRAMS) 46TESTS = $(check_PROGRAMS)
43endif 47endif
44 48
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 2a1d0d529..a15aba9fb 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -49,7 +49,7 @@ check_PROGRAMS = \
49 test_statistics_api_loop \ 49 test_statistics_api_loop \
50 test_statistics_api_watch 50 test_statistics_api_watch
51 51
52if !DISABLE_TEST_RUN 52if ENABLE_TEST_RUN
53TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 53TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
54endif 54endif
55 55
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index f17e48166..35a4b433e 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -28,7 +28,7 @@ gnunet_service_template_LDADD = \
28check_PROGRAMS = \ 28check_PROGRAMS = \
29 test_template_api 29 test_template_api
30 30
31if !DISABLE_TEST_RUN 31if ENABLE_TEST_RUN
32TESTS = $(check_PROGRAMS) 32TESTS = $(check_PROGRAMS)
33endif 33endif
34 34
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index ac57659ef..c25087d69 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -47,7 +47,7 @@ check_PROGRAMS = \
47 test_testing_topology_none \ 47 test_testing_topology_none \
48 test_testing_topology_scale_free 48 test_testing_topology_scale_free
49 49
50if !DISABLE_TEST_RUN 50if ENABLE_TEST_RUN
51TESTS = \ 51TESTS = \
52 test_testing \ 52 test_testing \
53 test_testing_connect \ 53 test_testing_connect \
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 2fc8e50ee..3b69627e3 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -24,7 +24,7 @@ gnunet_daemon_topology_LDADD = \
24check_PROGRAMS = \ 24check_PROGRAMS = \
25 test_gnunet_daemon_topology 25 test_gnunet_daemon_topology
26 26
27if !DISABLE_TEST_RUN 27if ENABLE_TEST_RUN
28TESTS = $(check_PROGRAMS) 28TESTS = $(check_PROGRAMS)
29endif 29endif
30 30
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 216fcb0cd..f68ec4315 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -234,10 +234,14 @@ libgnunet_plugin_transport_https_la_CFLAGS = \
234libgnunet_plugin_transport_https_la_CPPFLAGS = \ 234libgnunet_plugin_transport_https_la_CPPFLAGS = \
235 @LIBCURL_CPPFLAGS@ 235 @LIBCURL_CPPFLAGS@
236 236
237if HAVE_BENCHMARKS
238 TRANSPORT_BENCHMARKS = \
239 perf_transport_ats
240endif
237 241
238check_PROGRAMS = \ 242check_PROGRAMS = \
239 test_transport_ats \ 243 test_transport_ats \
240 perf_transport_ats \ 244 $(TRANSPORT_BENCHMARKS) \
241 test_transport_api_tcp \ 245 test_transport_api_tcp \
242 test_transport_api_tcp_nat \ 246 test_transport_api_tcp_nat \
243 test_transport_api_udp \ 247 test_transport_api_udp \
@@ -266,7 +270,7 @@ check_PROGRAMS = \
266 $(WLAN_UREL_TEST) 270 $(WLAN_UREL_TEST)
267# TODO: add tests for nat, etc. 271# TODO: add tests for nat, etc.
268 272
269if !DISABLE_TEST_RUN 273if ENABLE_TEST_RUN
270TESTS = \ 274TESTS = \
271 test_transport_ats \ 275 test_transport_ats \
272 perf_transport_ats \ 276 perf_transport_ats \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3a03516db..6c85e4064 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -114,6 +114,11 @@ libgnunet_plugin_test_la_SOURCES = \
114libgnunet_plugin_test_la_LDFLAGS = \ 114libgnunet_plugin_test_la_LDFLAGS = \
115 $(GN_PLUGIN_LDFLAGS) 115 $(GN_PLUGIN_LDFLAGS)
116 116
117if HAVE_BENCHMARKS
118 BENCHMARKS = \
119 perf_crypto_hash
120endif
121
117check_PROGRAMS = \ 122check_PROGRAMS = \
118 test_bio \ 123 test_bio \
119 test_client \ 124 test_client \
@@ -158,10 +163,10 @@ check_PROGRAMS = \
158 test_service \ 163 test_service \
159 test_strings \ 164 test_strings \
160 test_time \ 165 test_time \
161 perf_crypto_hash \ 166 $(BENCHMARKS) \
162 test_os_start_process 167 test_os_start_process
163 168
164if !DISABLE_TEST_RUN 169if ENABLE_TEST_RUN
165TESTS = $(check_PROGRAMS) 170TESTS = $(check_PROGRAMS)
166endif 171endif
167 172
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 5430ba3b9..f36031f7b 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -70,7 +70,7 @@ gnunet_daemon_exit_LDADD = \
70#check_PROGRAMS = \ 70#check_PROGRAMS = \
71# test_XXX 71# test_XXX
72 72
73if !DISABLE_TEST_RUN 73if ENABLE_TEST_RUN
74#TESTS = \ 74#TESTS = \
75# test_transport_api_tcp 75# test_transport_api_tcp
76endif 76endif