Imported Upstream version 3.1.0

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

diff --git a/config/amanda/dumpers.m4 b/config/amanda/dumpers.m4
index 3763d4e9640b94a0b46d9e9546fdf2e63834682d..d1b15e7a64579eecc96b3ff28bbf23de91d08812 100644 (file)
--- a/config/amanda/dumpers.m4
+++ b/config/amanda/dumpers.m4
@@ -36,20 +36,25 @@ AC_DEFUN([AMANDA_PROG_GNUTAR],
     if test "x$GNUTAR" = "xno"; then
        GNUTAR=
     else
+       OLD_GNUTAR=$GNUTAR
        for gnutar_name in gtar gnutar tar; do
            AC_PATH_PROGS(GNUTAR, $gnutar_name, , $LOCSYSPATH)
            if test -n "$GNUTAR"; then
-             case "`\"$GNUTAR\" --version 2>&1`" in
+             case `"$GNUTAR" --version 2>&1` in
               *GNU*tar* | *Free*paxutils* )
                            # OK, it is GNU tar
                            break
                            ;;
               *)
-                           # warning..
-                           AMANDA_MSG_WARN([$GNUTAR is not GNU tar, so it will not be used.])
-                           # reset the cache for GNUTAR so AC_PATH_PROGS will search again
-                           GNUTAR=''
-                           unset ac_cv_path_GNUTAR
+                           if test -n "$OLD_GNUTAR"; then
+                                   AMANDA_MSG_WARN([$GNUTAR is not GNU tar, it will be used.])
+                           else 
+                                   # warning..
+                                   AMANDA_MSG_WARN([$GNUTAR is not GNU tar, so it will not be used.])
+                                   # reset the cache for GNUTAR so AC_PATH_PROGS will search again
+                                   GNUTAR=''
+                                   unset ac_cv_path_GNUTAR
+                           fi
                            ;;
              esac
            fi
@@ -64,6 +69,72 @@ AC_DEFUN([AMANDA_PROG_GNUTAR],
     AC_SUBST(GNUTAR)
 ])
 
+# SYNOPSIS
+#
+#   AMANDA_PROG_STAR
+#
+# OVERVIEW
+#
+#   Search for a 'star' binary, placing the result in the precious 
+#   variable STAR.  The discovered binary is tested to ensure it's really
+#   star.
+#
+#   Also handle --with-star
+#
+AC_DEFUN([AMANDA_PROG_STAR],
+[
+    AC_REQUIRE([AMANDA_INIT_PROGS])
+
+    # call with
+    AC_ARG_WITH(star,
+       AS_HELP_STRING([--with-star=PROG],
+                      [use PROG as 'star']),
+       [
+           # check withval
+           case "$withval" in
+               /*) STAR="$withval";;
+               y|ye|yes) :;;
+               n|no) STAR=no ;;
+               *)  AC_MSG_ERROR([*** You must supply a full pathname to --with-star]);;
+           esac
+           # done
+       ]
+    )
+
+    if test "x$STAR" = "xno"; then
+       STAR=
+    else
+       OLD_STAR=$STAR
+       AC_PATH_PROGS(STAR, star, , $LOCSYSPATH)
+       if test -n "$STAR"; then
+           case `"$STAR" --version 2>/dev/null` in
+            *star*)
+                   # OK, it is star
+                   break
+                   ;;
+            *)
+                   if test -n "$OLD_STAR"; then
+                       AMANDA_MSG_WARN([$STAR is not star, it will be used.])
+                   else
+                       # warning..
+                       AMANDA_MSG_WARN([$STAR is not star, so it will not be used.])
+                       # reset the cache for STAR so AC_PATH_PROGS will search again
+                       STAR=''
+                       unset ac_cv_path_STAR
+                   fi
+                   ;;
+           esac
+       fi
+    fi
+
+    if test "x$STAR" != "x"; then
+       # define unquoted
+       AC_DEFINE_UNQUOTED(STAR, "$STAR", [Location of the 'star' binary])
+    fi
+    AC_ARG_VAR(STAR, [Location of the 'star' binary])
+    AC_SUBST(STAR)
+])
+
 # SYNOPSIS
 #
 #   AMANDA_PROG_SAMBA_CLIENT
@@ -107,7 +178,7 @@ AC_DEFUN([AMANDA_PROG_SAMBA_CLIENT],
       AC_PATH_PROG(SAMBA_CLIENT,smbclient,,$LOCSYSPATH)
       smbversion=0
       if test ! -z "$SAMBA_CLIENT"; then
-        case "`\"$SAMBA_CLIENT\" '\\\\nosuchhost.amanda.org\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in
+        case `"$SAMBA_CLIENT" '\\\\nosuchhost.amanda.org\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1` in
         *"Unknown host"*)
                      smbversion=1
                      ;;
@@ -236,7 +307,7 @@ AC_DEFUN([AMANDA_PROG_DUMP_RESTORE],
     DUMP_PROGRAMS="ufsdump dump backup"
     DUMP_RETURNS_1=
     AIX_BACKUP=
-    case "$target" in
+    case "$host" in
        *-dg-*)
            DUMP_PROGRAMS="dump "$DUMP_PROGRAMS
            DUMP_RETURNS_1=1
@@ -383,7 +454,7 @@ AC_DEFUN([AMANDA_CHECK_USE_RUNDUMP], [
     USE_RUNDUMP=no
 
     # some systems require rundump unconditionally
-    case "$target" in
+    case "$host" in
         *-ultrix*) USE_RUNDUMP=yes ;;
         *-dg-*) USE_RUNDUMP=yes ;;
     esac