X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Famanda%2Fdefaults.m4;h=343fc00881382fbb7c00a94c6f22992e1427df9e;hb=refs%2Ftags%2Fdebian%2F3.3.1-2;hp=a28931badab026048383acc8584cd09c8736273d;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/config/amanda/defaults.m4 b/config/amanda/defaults.m4
index a28931b..343fc00 100644
--- a/config/amanda/defaults.m4
+++ b/config/amanda/defaults.m4
@@ -9,13 +9,15 @@
 #	    define and substitute DEFAULT_TAPE_SERVER
 #	--with-tape-device
 #	    define and substitute DEFAULT_TAPE_DEVICE; substitue EXAMPLE_TAPEDEV
-#	--with-changer-device
-#	    define and substitute DEFAULT_CHANGER_DEVICE
 #	--with-amandates
 #	    define and substitute DEFAULT_AMANDATES_FILE
 #
 AC_DEFUN([AMANDA_SETUP_DEFAULTS],
 [
+    #allow configure CONFIG_CLOBBER_MY_CONFIG= to be used by make.
+    CONFIG_CLOBBER_MY_CONFIG=$CLOBBER_MY_CONFIG
+    AC_SUBST(CONFIG_CLOBBER_MY_CONFIG)
+
     AC_ARG_WITH(index-server,
 	AS_HELP_STRING([--with-index-server=HOST],
 	    [default amanda index server (default: `uname -n`)]),
@@ -97,29 +99,12 @@ AC_DEFUN([AMANDA_SETUP_DEFAULTS],
 
     AC_ARG_WITH(changer-device,
 	AS_HELP_STRING([--with-changer-device=DEV],
-	    [default tape changer device (default: /dev/ch0)]),
+	    [(deprecated)]),
 	[
-	    case "$withval" in
-	    "" | y | ye | yes | n | no)
-		AC_MSG_ERROR([*** You must supply an argument to the --with-changer-device option.])
-	      ;;
-	    *) DEFAULT_CHANGER_DEVICE="$withval"
-	      ;;
-	    esac
+            AMANDA_MSG_WARN([--with-changer-device is no longer used.])
 	]
     )
 
-    if test -z "$DEFAULT_CHANGER_DEVICE"; then
-	DEFAULT_CHANGER_DEVICE=/dev/null
-	if test -f /dev/ch0; then
-	    DEFAULT_CHANGER_DEVICE=/dev/ch0
-	fi
-    fi
-
-    AC_DEFINE_UNQUOTED(DEFAULT_CHANGER_DEVICE,"$DEFAULT_CHANGER_DEVICE",
-	[This is the default changer device. ])
-    AC_SUBST(DEFAULT_CHANGER_DEVICE)
-
     AC_ARG_WITH(amandates,
         AS_HELP_STRING([--with-amandates],
             [default location for 'amandates' (default: $localstatedir/amanda/amandates)]),
@@ -135,4 +120,12 @@ AC_DEFUN([AMANDA_SETUP_DEFAULTS],
 
     AC_DEFINE_DIR([DEFAULT_AMANDATES_FILE], [amandates],
         [Default location for 'amandates'])
+
+    DEFAULT_FSF_AFTER_FILEMARK="FALSE"
+    case "$host" in
+	*-solaris*) DEFAULT_FSF_AFTER_FILEMARK="TRUE"
+		    ;;
+    esac
+    AC_DEFINE_UNQUOTED(DEFAULT_FSF_AFTER_FILEMARK, $DEFAULT_FSF_AFTER_FILEMARK,
+	[Define if a FSF is needed on filemark.])
 ])