Imported Upstream version 2.6.1

[debian/amanda] / config / amanda / bsd-security.m4

diff --git a/config/amanda/bsd-security.m4 b/config/amanda/bsd-security.m4
index a37670720724ecc589009973d4a8720f7900159c..30ce62a5dd14efe79bfb2a68ea004141bbda6668 100644 (file)
--- a/config/amanda/bsd-security.m4
+++ b/config/amanda/bsd-security.m4
@@ -11,9 +11,10 @@
 #   Note that the defaults for *both* of these options are "yes", unlike
 #   the remainder of the security implementations.
 #
-#   Defines BSD_SECURITY, and sets AM_CONDITIONAL WANT_BSD_SECURITY,
-#   if the user has selected this mechanism.  Also defines USE_AMANDAHOSTS
-#   unless the user has specified --without-amandahosts.
+#   Defines and substitues BSD_SECURITY, and sets AM_CONDITIONAL
+#   WANT_BSD_SECURITY, if the user has selected this mechanism.
+#   Also defines and substitutes USE_AMANDAHOSTS unless the user has
+#   specified --without-amandahosts.
 #
 AC_DEFUN([AMANDA_BSD_SECURITY],
 [
@@ -24,7 +25,7 @@ AC_DEFUN([AMANDA_BSD_SECURITY],
         [
             case "$withval" in
                 n | no) BSD_SECURITY=no ;;
-                y |  ye | yes) ;;
+                y |  ye | yes) BSD_SECURITY=yes ;;
                 *) AC_MSG_ERROR([*** You must not supply an argument to --without-bsd-security.])
                     ;;
             esac
@@ -37,8 +38,8 @@ AC_DEFUN([AMANDA_BSD_SECURITY],
             [use ".rhosts" instead of ".amandahosts"]),
         [
             case "$withval" in
-                n | no ) USE_AMANDAHOSTS="no" ;;
-                y |  ye | yes) : ;;
+                n | no ) USE_AMANDAHOSTS=no ;;
+                y |  ye | yes) USE_AMANDAHOSTS=yes ;;
                 *) AC_MSG_ERROR([*** You must not supply an argument to --without-amandahosts option.])
                   ;;
             esac
@@ -55,4 +56,6 @@ AC_DEFUN([AMANDA_BSD_SECURITY],
     fi
 
     AM_CONDITIONAL(WANT_BSD_SECURITY, test x"$BSD_SECURITY" = x"yes")
+    AC_SUBST(BSD_SECURITY)
+    AC_SUBST(USE_AMANDAHOSTS)
 ])