diff options
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | po/POTFILES.in | 3 | ||||
-rw-r--r-- | src/include/gnunet_crypto_lib.h | 5 | ||||
-rw-r--r-- | src/transport/Makefile.am | 12 |
4 files changed, 20 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c0bf33421..30edf6285 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of GNUnet. | 1 | # This file is part of GNUnet. |
2 | # (C) 2001--2014 Christian Grothoff (and other contributing authors) | 2 | # (C) 2001--2015 Christian Grothoff (and other contributing authors) |
3 | # | 3 | # |
4 | # GNUnet is free software; you can redistribute it and/or modify | 4 | # GNUnet is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published | 5 | # it under the terms of the GNU General Public License as published |
@@ -202,6 +202,10 @@ AC_CHECK_LIB(socket, socket) | |||
202 | AC_CHECK_LIB(m, log) | 202 | AC_CHECK_LIB(m, log) |
203 | AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) | 203 | AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) |
204 | 204 | ||
205 | AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) | ||
206 | AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) | ||
207 | |||
208 | |||
205 | 209 | ||
206 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, | 210 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, |
207 | [AC_DEFINE(HAVE_TM_GMTOFF, 1, | 211 | [AC_DEFINE(HAVE_TM_GMTOFF, 1, |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 3d3e2a63e..561b834a5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -178,6 +178,7 @@ src/gns/nss/nss_gns.c | |||
178 | src/gns/nss/nss_gns_query.c | 178 | src/gns/nss/nss_gns_query.c |
179 | src/gns/plugin_block_gns.c | 179 | src/gns/plugin_block_gns.c |
180 | src/gns/plugin_gnsrecord_gns.c | 180 | src/gns/plugin_gnsrecord_gns.c |
181 | src/gns/plugin_rest_gns.c | ||
181 | src/gnsrecord/gnsrecord.c | 182 | src/gnsrecord/gnsrecord.c |
182 | src/gnsrecord/gnsrecord_crypto.c | 183 | src/gnsrecord/gnsrecord_crypto.c |
183 | src/gnsrecord/gnsrecord_misc.c | 184 | src/gnsrecord/gnsrecord_misc.c |
@@ -197,6 +198,7 @@ src/identity/gnunet-identity.c | |||
197 | src/identity/gnunet-service-identity.c | 198 | src/identity/gnunet-service-identity.c |
198 | src/identity/identity_api.c | 199 | src/identity/identity_api.c |
199 | src/identity/identity_api_lookup.c | 200 | src/identity/identity_api_lookup.c |
201 | src/identity/plugin_rest_identity.c | ||
200 | src/multicast/gnunet-multicast.c | 202 | src/multicast/gnunet-multicast.c |
201 | src/multicast/gnunet-service-multicast.c | 203 | src/multicast/gnunet-service-multicast.c |
202 | src/multicast/multicast_api.c | 204 | src/multicast/multicast_api.c |
@@ -257,6 +259,7 @@ src/regex/regex_internal_dht.c | |||
257 | src/regex/regex_test_graph.c | 259 | src/regex/regex_test_graph.c |
258 | src/regex/regex_test_lib.c | 260 | src/regex/regex_test_lib.c |
259 | src/regex/regex_test_random.c | 261 | src/regex/regex_test_random.c |
262 | src/rest/gnunet-rest-server.c | ||
260 | src/revocation/gnunet-revocation.c | 263 | src/revocation/gnunet-revocation.c |
261 | src/revocation/gnunet-service-revocation.c | 264 | src/revocation/gnunet-service-revocation.c |
262 | src/revocation/revocation_api.c | 265 | src/revocation/revocation_api.c |
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index 334dab156..1ebcfec97 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
@@ -708,8 +708,9 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, | |||
708 | * @param cls closure | 708 | * @param cls closure |
709 | * @param res resulting hash, NULL on error | 709 | * @param res resulting hash, NULL on error |
710 | */ | 710 | */ |
711 | typedef void (*GNUNET_CRYPTO_HashCompletedCallback) (void *cls, | 711 | typedef void |
712 | const struct GNUNET_HashCode *res); | 712 | (*GNUNET_CRYPTO_HashCompletedCallback) (void *cls, |
713 | const struct GNUNET_HashCode *res); | ||
713 | 714 | ||
714 | 715 | ||
715 | /** | 716 | /** |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index f7f6a9370..42432a403 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -489,8 +489,11 @@ check_PROGRAMS = \ | |||
489 | $(HTTP_QUOTA_TEST) \ | 489 | $(HTTP_QUOTA_TEST) \ |
490 | $(HTTPS_QUOTA_TEST) \ | 490 | $(HTTPS_QUOTA_TEST) \ |
491 | $(WLAN_QUOTA_TEST) \ | 491 | $(WLAN_QUOTA_TEST) \ |
492 | $(BT_QUOTA_TEST) \ | 492 | $(BT_QUOTA_TEST) |
493 | test_transport_api_slow_ats | 493 | if HAVE_GETOPT_BINARY |
494 | check_PROGRAMS += \ | ||
495 | test_transport_api_slow_ats | ||
496 | endif | ||
494 | endif | 497 | endif |
495 | 498 | ||
496 | if ENABLE_TEST_RUN | 499 | if ENABLE_TEST_RUN |
@@ -549,7 +552,6 @@ TESTS = \ | |||
549 | $(UNIX_QUOTA_TEST) \ | 552 | $(UNIX_QUOTA_TEST) \ |
550 | $(HTTP_QUOTA_TEST) \ | 553 | $(HTTP_QUOTA_TEST) \ |
551 | $(HTTPS_QUOTA_TEST) \ | 554 | $(HTTPS_QUOTA_TEST) \ |
552 | test_transport_api_slow_ats \ | ||
553 | test_transport_api_timeout_tcp \ | 555 | test_transport_api_timeout_tcp \ |
554 | test_transport_api_timeout_udp \ | 556 | test_transport_api_timeout_udp \ |
555 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ | 557 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
@@ -561,6 +563,10 @@ TESTS = \ | |||
561 | test_transport_address_switch_udp \ | 563 | test_transport_address_switch_udp \ |
562 | $(HTTP_SWITCH) \ | 564 | $(HTTP_SWITCH) \ |
563 | $(HTTPS_SWITCH) | 565 | $(HTTPS_SWITCH) |
566 | if HAVE_GETOPT_BINARY | ||
567 | TESTS += \ | ||
568 | test_transport_api_slow_ats | ||
569 | endif | ||
564 | endif | 570 | endif |
565 | 571 | ||
566 | test_transport_testing_startstop_SOURCES = \ | 572 | test_transport_testing_startstop_SOURCES = \ |