$NetBSD: patch-ae,v 1.21 2010/02/15 20:39:31 schwarz Exp $

--- configure.orig	2009-09-24 01:55:22.000000000 +0200
+++ configure
@@ -20246,14 +20246,14 @@ if test "x$ac_cv_file__usr_include_libxm
   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
 else
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libxml2/libxml" >&5
-$as_echo_n "checking for /usr/local/include/libxml2/libxml... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PREFIX}/include/libxml2/libxml" >&5
+$as_echo_n "checking for ${PREFIX}/include/libxml2/libxml... " >&6; }
 if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/local/include/libxml2/libxml"; then
+if test -r "${PREFIX}/include/libxml2/libxml"; then
   ac_cv_file__usr_local_include_libxml2_libxml=yes
 else
   ac_cv_file__usr_local_include_libxml2_libxml=no
@@ -20262,7 +20262,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
 $as_echo "$ac_cv_file__usr_local_include_libxml2_libxml" >&6; }
 if test "x$ac_cv_file__usr_local_include_libxml2_libxml" = x""yes; then :
-  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
+  CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
 else
   $as_echo "#define _NO_LIBXML 1" >>confdefs.h
 
@@ -22761,7 +22761,7 @@ if test "$gww_has_gettext" = "yes" >/dev
 
  cat </dev/null >$ac_confdir/po/Makefile.in
  echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in
  echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
  echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
  echo '' >> $ac_confdir/po/Makefile.in
@@ -22843,7 +22843,7 @@ if test "$gww_archlist" != "" ; then
   LDFLAGS="$LDFLAGS $gww_archlist"
 fi
 
-CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//`
+CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O[1-9]//g | sed -e s/-O//g`
 
 cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in
 cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in