projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.6.1
[debian/amanda]
/
config
/
amanda
/
ssh-security.m4
diff --git
a/config/amanda/ssh-security.m4
b/config/amanda/ssh-security.m4
index 9fd8d9758c1a7ad5c6f28bf4d69bfcc94769f9e2..e5e4c3483ac6c841a29baf53067819e26c821dc4 100644
(file)
--- 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
# 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],
[
#
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
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.])
;;
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")
[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)
])
])