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 @@ # This file is part of GNUnet. -# (C) 2001--2014 Christian Grothoff (and other contributing authors) +# (C) 2001--2015 Christian Grothoff (and other contributing authors) # # GNUnet is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published @@ -202,6 +202,10 @@ AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(m, log) AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) +AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) +AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) + + AC_CHECK_MEMBER(struct tm.tm_gmtoff, [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 src/gns/nss/nss_gns_query.c src/gns/plugin_block_gns.c src/gns/plugin_gnsrecord_gns.c +src/gns/plugin_rest_gns.c src/gnsrecord/gnsrecord.c src/gnsrecord/gnsrecord_crypto.c src/gnsrecord/gnsrecord_misc.c @@ -197,6 +198,7 @@ src/identity/gnunet-identity.c src/identity/gnunet-service-identity.c src/identity/identity_api.c src/identity/identity_api_lookup.c +src/identity/plugin_rest_identity.c src/multicast/gnunet-multicast.c src/multicast/gnunet-service-multicast.c src/multicast/multicast_api.c @@ -257,6 +259,7 @@ src/regex/regex_internal_dht.c src/regex/regex_test_graph.c src/regex/regex_test_lib.c src/regex/regex_test_random.c +src/rest/gnunet-rest-server.c src/revocation/gnunet-revocation.c src/revocation/gnunet-service-revocation.c 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, * @param cls closure * @param res resulting hash, NULL on error */ -typedef void (*GNUNET_CRYPTO_HashCompletedCallback) (void *cls, - const struct GNUNET_HashCode *res); +typedef void +(*GNUNET_CRYPTO_HashCompletedCallback) (void *cls, + const struct GNUNET_HashCode *res); /** 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 = \ $(HTTP_QUOTA_TEST) \ $(HTTPS_QUOTA_TEST) \ $(WLAN_QUOTA_TEST) \ - $(BT_QUOTA_TEST) \ - test_transport_api_slow_ats + $(BT_QUOTA_TEST) +if HAVE_GETOPT_BINARY +check_PROGRAMS += \ +test_transport_api_slow_ats +endif endif if ENABLE_TEST_RUN @@ -549,7 +552,6 @@ TESTS = \ $(UNIX_QUOTA_TEST) \ $(HTTP_QUOTA_TEST) \ $(HTTPS_QUOTA_TEST) \ - test_transport_api_slow_ats \ test_transport_api_timeout_tcp \ test_transport_api_timeout_udp \ $(UNIX_PLUGIN_TIMEOUT_TEST) \ @@ -561,6 +563,10 @@ TESTS = \ test_transport_address_switch_udp \ $(HTTP_SWITCH) \ $(HTTPS_SWITCH) +if HAVE_GETOPT_BINARY +TESTS += \ +test_transport_api_slow_ats +endif endif test_transport_testing_startstop_SOURCES = \ |