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

--- configure.orig	2008-02-08 16:34:38.000000000 -0500
+++ configure
@@ -13538,7 +13538,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
 
@@ -38647,8 +38650,10 @@ fi
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
+if false ; then
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+fi
 
 # Prevent multiple expansion
 
@@ -62491,7 +62496,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