X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Famanda%2Fssh-security.m4;h=e5e4c3483ac6c841a29baf53067819e26c821dc4;hb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;hp=9fd8d9758c1a7ad5c6f28bf4d69bfcc94769f9e2;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/config/amanda/ssh-security.m4 b/config/amanda/ssh-security.m4
index 9fd8d97..e5e4c34 100644
--- a/config/amanda/ssh-security.m4
+++ b/config/amanda/ssh-security.m4
@@ -5,17 +5,18 @@
 # OVERVIEW
 #
 #   Handle configuration for SSH security, implementing the --with-ssh-security
-#   option and checking for the relevant programs and options.
+#   option and checking for the relevant programs and options.  Defines and substitutes
+#   SSH_SECURITY, searches for and defines SSH, and defines SSH_OPTIONS.
 #
 AC_DEFUN([AMANDA_SSH_SECURITY],
 [
-    SSH_SECURITY=no
+    SSH_SECURITY=yes
     AC_ARG_WITH(ssh-security,
         AS_HELP_STRING([--with-ssh-security], 
                 [include SSH authentication]),
         [
             case "$withval" in
-                n | no) : ;;
+                n | no) SSH_SECURITY=no ;;
                 y |  ye | yes) SSH_SECURITY=yes ;;
                 *) AC_MSG_ERROR([*** You must not supply an argument to --with-ssh-security.])
               ;;
@@ -68,4 +69,7 @@ AC_DEFUN([AMANDA_SSH_SECURITY],
                 [Arguments to ssh])
     fi
     AM_CONDITIONAL(WANT_SSH_SECURITY, test x"$SSH_SECURITY" = x"yes")
+
+    AC_SUBST(SSH_SECURITY)
+    # (note -- don't just substitute SSH_OPTIONS -- shell quoting will break)
 ])