pkgsrc/sysutils/amanda-client/patches/patch-ai

$NetBSD: patch-ai,v 1.2 2008/02/15 16:23:09 gdt Exp $

--- configure.orig	2007-06-06 19:22:45.000000000 -0400
+++ configure
@@ -1119,6 +1119,7 @@ Optional Packages:
   --with-testing[=suffix] use alternate service names
   --with-gnuplot=PATH     use gnuplot executable at PATH in amplot
   --with-dump-honor-nodump  if dump supports -h, use it for level0s too
+  --with-dump-use-snapshot  if dump supports -X, use it
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
@@ -13538,7 +13539,10 @@ echo $ECHO_N "checking SSH options... $E
     # now convert that to a comma-separated list of C strings
     eval "set dummy ${SSH_OPTIONS}"; shift
     SSH_OPTIONS=''
-    for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done
+    for i in "${@}"; do
+	quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\""
+	SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted";
+     done
     echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5
 echo "${ECHO_T}$SSH_OPTIONS" >&6
 
@@ -18808,6 +18812,72 @@ _ACEOF
       fi
 
 fi;
+
+# Check whether --with-dump-use-snapshot or --without-dump-use-snapshot was given.
+if test "${with_dump_use_snapshot+set}" = set; then
+  withval="$with_dump_use_snapshot"
+   if test -x $DUMP; then
+        echo "$as_me:$LINENO: checking whether $DUMP supports -X (use filesystem snapshot)" >&5
+echo $ECHO_N "checking whether $DUMP supports -X (use filesystem snapshot)... $ECHO_C" >&6
+if test "${amanda_cv_use_snapshot+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	    case "$DUMP" in
+	    *dump)
+		{ ac_try='$DUMP 9Xf /dev/null /dev/null/invalid/fs 2>&1
+		    | $GREP -v Dumping
+		    | $GREP -v Date
+		    | $GREP -v Label >conftest.d-x 2>&1'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+		cat conftest.d-x >&5
+		{ ac_try='$DUMP 9f /dev/null /dev/null/invalid/fs 2>&1
+		    | $GREP -v Dumping
+		    | $GREP -v Date
+		    | $GREP -v Label >conftest.d 2>&1'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+		cat conftest.d >&5
+		if { ac_try='diff conftest.d-x conftest.d 1>&2'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+		    amanda_cv_use_snapshot=yes
+		else
+		    amanda_cv_use_snapshot=no
+		fi
+		rm -f conftest.d conftest.d-x
+	      ;;
+	    *) amanda_cv_use_snapshot=no
+	      ;;
+	    esac
+
+fi
+echo "$as_me:$LINENO: result: $amanda_cv_use_snapshot" >&5
+echo "${ECHO_T}$amanda_cv_use_snapshot" >&6
+      else
+	{ echo "$as_me:$LINENO: WARNING: *** $DUMP is not executable, cannot run -X test" >&5
+echo "$as_me: WARNING: *** $DUMP is not executable, cannot run -X test" >&2;}
+	amanda_cv_use_snapshot=no
+      fi
+      if test "$amanda_cv_use_snapshot" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DUMP_SNAPSHOT 1
+_ACEOF
+
+      fi
+
+fi;
 fi
 
 for ac_prog in xfsdump
@@ -62491,7 +62561,7 @@ fi;
 # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given.
 if test "${with_xsltproc_flags+set}" = set; then
   withval="$with_xsltproc_flags"
-   if test "x$withval" == "xno"; then
+   if test "x$withval" = "xno"; then
 	XSLTPROC_FLAGS=''
     else
 	if test "x$withval" != "xyes"; then