$NetBSD: patch-aa,v 1.4 2011/01/25 22:22:16 shattered Exp $

--- configure.orig	2006-01-19 21:35:56.000000000 +0100
+++ configure
@@ -620,9 +620,9 @@ ac_configure=$ac_aux_dir/configure # Thi
 TOP=`pwd`
 
 
-if test "$CXXFLAGS" = ""; then 
-  CXXFLAGS="-O2"
-fi
+#if test "$CXXFLAGS" = ""; then 
+#  CXXFLAGS="-O2"
+#fi
 
 LTVERSION=`cat VERSION | cut -d'.' -f1,2 | sed 's/\./:/g'`
 
@@ -1684,6 +1684,13 @@ EOF
 
 fi
 
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
 echo $ac_n "checking for memmove""... $ac_c" 1>&6
 echo "configure:1689: checking for memmove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
@@ -1988,6 +1995,13 @@ fi
 
 
 
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
 echo $ac_n "checking for ANSI template instantiation""... $ac_c" 1>&6
 echo "configure:1993: checking for ANSI template instantiation" >&5
 if eval "test \"`echo '$''{'ac_cv_c_template_ansi'+set}'`\" = set"; then
@@ -2030,6 +2044,13 @@ EOF
 
 fi
 
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
 # Check whether --enable-http or --disable-http was given.
 if test "${enable_http+set}" = set; then
   enableval="$enable_http"