$NetBSD: patch-aa,v 1.20 2002/04/09 22:50:02 jlam Exp $

--- configure.orig	Mon Mar 18 18:42:35 2002
+++ configure
@@ -1638,7 +1638,7 @@
 # implement the "install-strip" target properly (strip executables,
 # but do not try to strip scripts.)
 #
-INSTALL_SCRIPT='${INSTALL}'
+#INSTALL_SCRIPT='${INSTALL}'
 
 # random libc stuff
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
@@ -6095,7 +6095,7 @@
   if test "$have_kerberos5" = yes ; then
     # from Matt Knopp <mhat@infocalypse.netlag.com>
     # (who got it from amu@mit.edu)
-    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
+    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err -lcrypt"
   elif test "$have_kerberos" = yes ; then
     # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2
     PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err"
@@ -7584,7 +7584,7 @@
     /*)
      echo $ac_n "checking for XML headers""... $ac_c" 1>&6
 echo "configure:7598: checking for XML headers" >&5
-     d=$with_xml/include
+     d=$with_xml/include/gnome-xml
      if test -d $d; then
        X_CFLAGS="-I$d $X_CFLAGS"
        echo "$ac_t""$d" 1>&6
@@ -10635,15 +10635,6 @@
 DEPEND_DEFINES=
 
 
-if test \! -z "$includedir" ; then 
-  INCLUDES="$INCLUDES -I$includedir"
-fi
-
-if test \! -z "$libdir" ; then
-  LDFLAGS="$LDFLAGS -L$libdir"
-fi
-
-
 PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm
 ALL_DEMO_PROGRAMS=
 if test "$have_motif" = yes; then
@@ -10745,7 +10736,7 @@
   GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps'
 elif test "$have_gtk" = yes; then
   # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong...
-  GTK_ICONDIR='/usr/share/pixmaps'
+  GTK_ICONDIR='$(prefix)/share/pixmaps'
 else
   GTK_ICONDIR=''
 fi
