Imported Upstream version 2.6.1

[debian/amanda] / config / amanda / dumpers.m4

diff --git a/config/amanda/dumpers.m4 b/config/amanda/dumpers.m4
index 9c455c6032670001cb8df5ea0ea6ed9b2bae7260..76b20d93cc8b1a4e07ccea8df66daec8fe38a587 100644 (file)
--- a/config/amanda/dumpers.m4
+++ b/config/amanda/dumpers.m4
@@ -214,7 +214,8 @@ AC_DEFUN([AMANDA_PROG_XFSDUMP_XFSRESTORE],
 #   the binaries we search for depends on the target system.  If working
 #   binaries are found, DUMP and RESTORE are defined to their full paths.
 #
-#   DUMP_RETURNS is defined if the system's 'dump' returns 1 on success.
+#   DUMP_RETURNS_1 is defined and substituted if the system's 'dump'
+#   returns 1 on success.
 #
 #   HAVE_DUMP_ESTIMATE is defined to the dump flag which enables estimates.
 #
@@ -233,23 +234,25 @@ AC_DEFUN([AMANDA_PROG_DUMP_RESTORE],
     # a variable is set up here to specify the order of dump programs to
     # search for on the system.
     DUMP_PROGRAMS="ufsdump dump backup"
-    dump_returns_1=
+    DUMP_RETURNS_1=
+    AIX_BACKUP=
     case "$target" in
        *-dg-*)
            DUMP_PROGRAMS="dump "$DUMP_PROGRAMS
-           dump_returns_1=yes
+           DUMP_RETURNS_1=1
            ;;
       *-ibm-aix*)
            DUMP_PROGRAMS="backup "$DUMP_PROGRAMS
+           AIX_BACKUP=1
            AC_DEFINE(AIX_BACKUP,1,
                [Is DUMP the AIX program 'backup'?])
            ;;
       *-ultrix*)
-           dump_returns_1=yes
+           DUMP_RETURNS_1=1
            ;;
     esac
 
-    if test -n "$dump_returns_1"; then
+    if test -n "$DUMP_RETURNS_1"; then
       AC_DEFINE(DUMP_RETURNS_1,1,
        [Define this if this system's dump exits with 1 as a success code. ])
     fi
@@ -362,6 +365,9 @@ AC_DEFUN([AMANDA_PROG_DUMP_RESTORE],
            fi
        ])
     fi
+
+    AC_SUBST(AIX_BACKUP)
+    AC_SUBST(DUMP_RETURNS_1)
 ])
 
 # SYNOPSIS
@@ -371,7 +377,7 @@ AC_DEFUN([AMANDA_PROG_DUMP_RESTORE],
 # DESCRIPTION
 #
 #   Decide if the 'rundump' setuid-root wrapper should be used to invoke
-#   dump.  If so, USE_RUNDUMP is #defined.
+#   dump.  If so, USE_RUNDUMP is defined and substituted.
 #
 AC_DEFUN([AMANDA_CHECK_USE_RUNDUMP], [
     USE_RUNDUMP=no
@@ -392,7 +398,12 @@ AC_DEFUN([AMANDA_CHECK_USE_RUNDUMP], [
         ])
 
     if test x"$USE_RUNDUMP" = x"yes"; then
+       USE_RUNDUMP=1
         AC_DEFINE(USE_RUNDUMP,1,
             [Define to invoke rundump (setuid-root) instead of DUMP program directly. ])
+    else
+       USE_RUNDUMP=
     fi
+
+    AC_SUBST(USE_RUNDUMP)
 ])