Imported Upstream version 2.6.1

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

diff --git a/config/amanda/bsdtcp-security.m4 b/config/amanda/bsdtcp-security.m4
index 044415b8ea1386565451c1728231faac21293d2c..10192e1dfd6bcfe868f8dfb77ea78234aac83634 100644 (file)
--- a/config/amanda/bsdtcp-security.m4
+++ b/config/amanda/bsdtcp-security.m4
@@ -7,18 +7,18 @@
 #   Handle configuration for BSDTCP security, implementing the 
 #   --with-bsdtcp-security option.
 #
-#   Defines BSDTCP_SECURITY, and sets AM_CONDITIONAL WANT_BSDTCP_SECURITY,
-#   if the user has selected this mechanism.
+#   Defines and substitutes BSDTCP_SECURITY, and sets AM_CONDITIONAL 
+#   WANT_BSDTCP_SECURITY, if the user has selected this mechanism.
 #
 AC_DEFUN([AMANDA_BSDTCP_SECURITY],
 [
-    BSDTCP_SECURITY="no"
+    BSDTCP_SECURITY="yes"
     AC_ARG_WITH(bsdtcp-security,
         AS_HELP_STRING([--with-bsdtcp-security],
                 [include BSDTCP authentication]),
         [
             case "$withval" in
-                n | no) : ;;
+                n | no) BSDTCP_SECURITY=no ;;
                 y |  ye | yes) BSDTCP_SECURITY=yes ;;
                 *) AC_MSG_ERROR([*** You must not supply an argument to --with-bsdtcp-security.])
               ;;
@@ -30,5 +30,7 @@ AC_DEFUN([AMANDA_BSDTCP_SECURITY],
         AC_DEFINE(BSDTCP_SECURITY,1,
             [Define if BSDTCP transport should be enabled.])
     fi
+
     AM_CONDITIONAL(WANT_BSDTCP_SECURITY, test x"$BSDTCP_SECURITY" = x"yes")
+    AC_SUBST(BSDTCP_SECURITY)
 ])