Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,10 @@ AS_IF([test "x$ENABLED_SSHD" = "xyes"],[
])

AC_CONFIG_LINKS([keys/gretel-key-rsa.pub:keys/gretel-key-rsa.pub
keys/gretel-key-rsa.pem:keys/gretel-key-rsa.pem])
keys/gretel-key-rsa.pem:keys/gretel-key-rsa.pem
keys/server-key-rsa.der:keys/server-key-rsa.der
keys/server-key-ecc.der:keys/server-key-ecc.der
keys/server-key-ecc-521.der:keys/server-key-ecc-521.der])

# Set the automake conditionals.
AM_CONDITIONAL([BUILD_EXAMPLE_SERVERS],[test "x$ENABLED_EXAMPLES" = "xyes"])
Expand Down
9 changes: 7 additions & 2 deletions scripts/fwd.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ then
exit 77
fi

if [ ! -x ./scripts/fwd.test.expect ]
# Automake sets $srcdir for tests. When building out-of-tree (e.g.
# make distcheck), the expect script only lives in the source tree,
# not the build tree. Fall back to the current directory otherwise.
expect_script="${srcdir:-.}/scripts/fwd.test.expect"

if [ ! -x "$expect_script" ]
then
echo "fail: missing expect script"
exit 1
Expand Down Expand Up @@ -46,4 +51,4 @@ fi

# Run the expect script

./scripts/fwd.test.expect
"$expect_script"
Loading