diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,8 @@ | |||
1 | 2014020 | 1 | 2014020 |
2 | - (djm) [configure.ac] Check OpenSSL version is supported at configure time; | 2 | - (djm) [configure.ac] Check OpenSSL version is supported at configure time; |
3 | suggested by Kevin Brott | 3 | suggested by Kevin Brott |
4 | - (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than | ||
5 | -L/-l; fixes linking problems on some platforms | ||
4 | 6 | ||
5 | 20140819 | 7 | 20140819 |
6 | - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen | 8 | - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen |
diff --git a/Makefile.in b/Makefile.in index 78a4cba98..0302b6c41 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.362 2014/07/18 20:33:12 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.363 2014/08/20 01:06:21 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -456,7 +456,7 @@ UNITTESTS_TEST_SSHBUF_OBJS=\ | |||
456 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \ | 456 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \ |
457 | regress/unittests/test_helper/libtest_helper.a libssh.a | 457 | regress/unittests/test_helper/libtest_helper.a libssh.a |
458 | $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \ | 458 | $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \ |
459 | -L regress/unittests/test_helper -ltest_helper \ | 459 | regress/unittests/test_helper/libtest_helper.a \ |
460 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 460 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
461 | 461 | ||
462 | UNITTESTS_TEST_SSHKEY_OBJS=\ | 462 | UNITTESTS_TEST_SSHKEY_OBJS=\ |