diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/util/Makefile.am | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9ae80398f..dde57e9cc 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -200,6 +200,8 @@ AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) | |||
200 | AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) | 200 | AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) |
201 | AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) | 201 | AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) |
202 | 202 | ||
203 | AC_CHECK_PROG(VAR_SSH_BINARY,ssh,true,false) | ||
204 | AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) | ||
203 | 205 | ||
204 | 206 | ||
205 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, | 207 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, |
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 05858f1f8..ca3a361aa 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -254,10 +254,14 @@ if HAVE_BENCHMARKS | |||
254 | perf_malloc | 254 | perf_malloc |
255 | endif | 255 | endif |
256 | 256 | ||
257 | if HAVE_SSH_BINARY | ||
258 | SSH_USING_TESTS = test_socks.nc | ||
259 | endif | ||
260 | |||
257 | check_PROGRAMS = \ | 261 | check_PROGRAMS = \ |
258 | test_bio \ | 262 | test_bio \ |
259 | test_client.nc \ | 263 | test_client.nc \ |
260 | test_socks.nc \ | 264 | $(SSH_USING_TESTS) \ |
261 | test_common_allocation \ | 265 | test_common_allocation \ |
262 | test_common_endian \ | 266 | test_common_endian \ |
263 | test_common_logging \ | 267 | test_common_logging \ |