[GNUnet-SVN] r35394 - in gnunet: . po src/include src/transport

[gnunet]

Author: grothoff
Date: 2015-03-15 22:15:14 +0100 (Sun, 15 Mar 2015)
New Revision: 35394

Modified:
   gnunet/configure.ac
   gnunet/po/POTFILES.in
   gnunet/src/include/gnunet_crypto_lib.h
   gnunet/src/transport/Makefile.am
Log:
check for existence of 'getopt' command line tool

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2015-03-15 17:30:28 UTC (rev 35393)
+++ gnunet/configure.ac 2015-03-15 21:15:14 UTC (rev 35394)
@@ -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,7 +202,11 @@
 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,
      [Define if struct tm has the tm_gmtoff member.])],

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2015-03-15 17:30:28 UTC (rev 35393)
+++ gnunet/po/POTFILES.in       2015-03-15 21:15:14 UTC (rev 35394)
@@ -178,6 +178,7 @@
 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-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_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

Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h      2015-03-15 17:30:28 UTC (rev 
35393)
+++ gnunet/src/include/gnunet_crypto_lib.h      2015-03-15 21:15:14 UTC (rev 
35394)
@@ -708,8 +708,9 @@
  * @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);
 
 
 /**

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2015-03-15 17:30:28 UTC (rev 35393)
+++ gnunet/src/transport/Makefile.am    2015-03-15 21:15:14 UTC (rev 35394)
@@ -489,9 +489,12 @@
  $(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
 AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
@@ -549,7 +552,6 @@
  $(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,7 +563,11 @@
  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 = \
  test_transport_testing_startstop.c