Imported Upstream version 2.6.1

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

diff --git a/config/amanda/krb4-security.m4 b/config/amanda/krb4-security.m4
index 68f541676ee4eca328d3f20c70d5771bd14ee37a..446be93e1c2c6a5e83035f4766efce3febd8d796 100644 (file)
--- a/config/amanda/krb4-security.m4
+++ b/config/amanda/krb4-security.m4
@@ -7,9 +7,9 @@
 #   Handle configuration for KRB4 security, implementing the --with-krb4-security
 #   option.  If libraries are found, they are added to the relevant compiler flags.
 #
-#   Defines KRB4_SECURITY, and sets AM_CONDITIONAL WANT_KRB4_SECURITY,
+#   Defines and substitutes KRB4_SECURITY, and sets AM_CONDITIONAL WANT_KRB4_SECURITY,
 #   if the user has selected this mechanism.  Also, the following parameters
-#   are taken from options and defined:
+#   are taken from options, defined, and substituted:
 #
 #    - SERVER_HOST_PRINCIPAL
 #    - SERVER_HOST_INSTANCE
@@ -231,4 +231,14 @@ AC_DEFUN([AMANDA_KRB4_SECURITY],
         fi
     fi
     AM_CONDITIONAL(WANT_KRB4_SECURITY, test x"$KRB4_SECURITY" = x"yes")
+
+    AC_SUBST(KRB4_SECURITY)
+
+    AC_SUBST(SERVER_HOST_PRINCIPAL)
+    AC_SUBST(SERVER_HOST_INSTANCE)
+    AC_SUBST(SERVER_HOST_KEY_FILE)
+    AC_SUBST(CLIENT_HOST_PRINCIPAL)
+    AC_SUBST(CLIENT_HOST_INSTANCE)
+    AC_SUBST(CLIENT_HOST_KEY_FILE)
+    AC_SUBST(TICKET_LIFETIME)
 ])