From 9e80de70a59fa7408e08e13cd98e5b4dd2d3813c Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 16 Apr 2026 15:06:34 -0600 Subject: [PATCH 1/2] fixes for make distcheck --- configure.ac | 3 ++- scripts/fwd.test | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 09bd6e414..c7cc2cac3 100644 --- a/configure.ac +++ b/configure.ac @@ -280,7 +280,8 @@ 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]) # Set the automake conditionals. AM_CONDITIONAL([BUILD_EXAMPLE_SERVERS],[test "x$ENABLED_EXAMPLES" = "xyes"]) diff --git a/scripts/fwd.test b/scripts/fwd.test index 6214d7db6..1b1c9eb85 100755 --- a/scripts/fwd.test +++ b/scripts/fwd.test @@ -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 @@ -46,4 +51,4 @@ fi # Run the expect script -./scripts/fwd.test.expect +"$expect_script" From 422d4ed53a756ddaff82f657e96758e87e2d912d Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 16 Apr 2026 15:57:28 -0600 Subject: [PATCH 2/2] add example ecc keys also to ac config link for out of tree builds --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c7cc2cac3..4b8279780 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,9 @@ 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/server-key-rsa.der:keys/server-key-rsa.der]) + 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"])