[GNUnet-SVN] r36212 - in gnunet: . src/util

[gnunet]

Author: burdges
Date: 2015-08-06 00:34:54 +0200 (Thu, 06 Aug 2015)
New Revision: 36212

Modified:
   gnunet/configure.ac
   gnunet/src/util/Makefile.am
Log:
Make SOCKS test conditional on an SSH binary 



Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2015-08-05 21:47:36 UTC (rev 36211)
+++ gnunet/configure.ac 2015-08-05 22:34:54 UTC (rev 36212)
@@ -200,6 +200,8 @@
 AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false)
 AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY)
 
+AC_CHECK_PROG(VAR_SSH_BINARY,ssh,true,false)
+AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY)
 
 
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2015-08-05 21:47:36 UTC (rev 36211)
+++ gnunet/src/util/Makefile.am 2015-08-05 22:34:54 UTC (rev 36212)
@@ -254,10 +254,14 @@
   perf_malloc
 endif
 
+if HAVE_SSH_BINARY
+ SSH_USING_TESTS = test_socks.nc
+endif
+
 check_PROGRAMS = \
  test_bio \
  test_client.nc \
- test_socks.nc \
+ $(SSH_USING_TESTS) \
  test_common_allocation \
  test_common_endian \
  test_common_logging \