$NetBSD: patch-aa,v 1.2 1999/09/08 16:13:08 rh Exp $

--- configure.orig	Tue Sep  7 00:59:57 1999
+++ configure	Wed Sep  8 11:47:59 1999
@@ -1976,6 +1976,7 @@
   ac_tool_prefix=
 fi
 
+if false; then
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
@@ -2208,6 +2209,7 @@
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+fi
 
 # Redirect the config.log output again, so that the ltconfig log is not
 # clobbered by the next message.
@@ -2938,7 +2940,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
+LIBS="-L${LOCALBASE}/lib -lxml -lz ${LIBS}"
 cat > conftest.$ac_ext <<EOF
 #line 2944 "configure"
 #include "confdefs.h"
@@ -2969,7 +2971,8 @@
   
 		
 		
-		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
+		GNOME_XML_LIB="-L${LOCALBASE}/lib -lxml -lz -lintl"
+		XGETTEXT="${LOCALBASE}/bin/xgettext"
 	
 else
   echo "$ac_t""no" 1>&6
@@ -4735,8 +4738,8 @@
                                                                                  
 PRINT_LIBDIR='-L${libdir}'
 PRINT_INCLUDEDIR='-I${includedir}'
-PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `gnome-config --cflags gnomeui xml`"
-PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui xml`"
+PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `gnome-config --cflags gnomeui` -I${LOCALBASE}/include"
+PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui` -L${LOCALBASE}/lib -lxml -lz -lintl"
 
 
 
@@ -5143,10 +5146,12 @@
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
+if false; then
   case "$ac_given_INSTALL" in
   [/$]*) INSTALL="$ac_given_INSTALL" ;;
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
   esac
+fi
 
   echo creating "$ac_file"
   rm -f "$ac_file"
