$NetBSD: patch-aa,v 1.8 1998/11/07 10:52:30 tron Exp $

--- configure.orig	Fri Jul 10 20:37:57 1998
+++ configure	Fri Nov  6 23:04:59 1998
@@ -501,9 +501,9 @@
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    CONFIG_SITE="$prefix/share/kde/config.site $prefix/etc/config.site"
   else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    CONFIG_SITE="$ac_default_prefix/share/kde/config.site $ac_default_prefix/etc/config.site"
   fi
 fi
 for ac_site_file in $CONFIG_SITE; do
@@ -1688,6 +1688,8 @@
 ac_save_cflags="$CFLAGS"
 CC=$CXX
 CFLAGS="$CXXFLAGS"
+
+if false; then
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
@@ -1733,6 +1735,8 @@
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+fi
+
  CC=$ac_save_cc
 CFLAGS="$ac_save_cflags"
 
@@ -4691,37 +4695,37 @@
 echo "configure:4692: checking for KDE paths" >&5
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir="\$(prefix)/share/doc/HTML"
+    kde_htmldir="\$(prefix)/share/doc/kde/HTML"
   fi
   if test -z "$kde_appsdir"; then
-    kde_appsdir="\$(prefix)/share/applnk"
+    kde_appsdir="\$(prefix)/share/kde/applnk"
   fi
   if test -z "$kde_icondir"; then
-    kde_icondir="\$(prefix)/share/icons"
+    kde_icondir="\$(prefix)/share/kde/icons"
   fi
   if test -z "$kde_sounddir"; then
-    kde_sounddir="\$(prefix)/share/sounds"
+    kde_sounddir="\$(prefix)/share/kde/sounds"
   fi
   if test -z "$kde_datadir"; then
-    kde_datadir="\$(prefix)/share/apps"
+    kde_datadir="\$(prefix)/share/kde/apps"
   fi
   if test -z "$kde_locale"; then
-    kde_locale="\$(prefix)/share/locale"
+    kde_locale="\$(prefix)/share/kde/locale"
   fi
   if test -z "$kde_cgidir"; then
     kde_cgidir="\$(exec_prefix)/cgi-bin"
   fi
   if test -z "$kde_confdir"; then
-    kde_confdir="\$(prefix)/share/config"
+    kde_confdir="\$(prefix)/share/kde/config"
   fi
   if test -z "$kde_mimedir"; then
-    kde_mimedir="\$(prefix)/share/mimelnk"
+    kde_mimedir="\$(prefix)/share/kde/mimelnk"
   fi
   if test -z "$kde_toolbardir"; then
-    kde_toolbardir="\$(prefix)/share/toolbar"
+    kde_toolbardir="\$(prefix)/share/kde/toolbar"
   fi
   if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir="\$(prefix)/share/wallpapers"
+    kde_wallpaperdir="\$(prefix)/share/kde/wallpapers"
   fi
   if test -z "$kde_bindir"; then
     kde_bindir="\$(exec_prefix)/bin"