--- configure.orig	2012-05-02 13:04:11 UTC
+++ configure
@@ -3389,10 +3389,10 @@ then
 if test "$enable_opt" != "no"
 then
   printf 'checking for CPU optimization availability... '
-  if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
+  if printf 'main() {}' | $CC -xc -O3 -o config.tmp - >config.tmp 2>&1
   then
-    MYCFLAGS="-march=native $MYCFLAGS"
-    MYCXXFLAGS="-march=native $MYCXXFLAGS"
+    MYCFLAGS="-O3 $MYCFLAGS"
+    MYCXXFLAGS="-O3 $MYCXXFLAGS"
     printf 'yes\n'
   else
     printf 'no\n'
@@ -3729,7 +3729,7 @@ else
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lstdc++  $LIBS"
+LIBS="$LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3758,7 +3758,7 @@ _ACEOF
 #define HAVE_LIBSTDC__ 1
 _ACEOF
 
-  LIBS="-lstdc++ $LIBS"
+  LIBS="$LIBS"
 
 fi
 
