--- configure.orig	2013-06-04 17:42:47.000000000 +1000
+++ configure	2014-12-05 06:58:49.000000000 +1100
@@ -3057,13 +3057,13 @@
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+    CXXFLAGS="-g"
   else
     CXXFLAGS="-g"
   fi
 else
   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
+    CXXFLAGS=""
   else
     CXXFLAGS=
   fi
@@ -3506,13 +3506,13 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS=""
   else
     CFLAGS=
   fi
@@ -3654,8 +3654,8 @@
 fi
 
 	if test "$GCC" = "yes"; then
-	   CFLAGS="$CFLAGS -O2 -DNDEBUG"
-	   CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
+	   CFLAGS="$CFLAGS -DNDEBUG"
+	   CXXFLAGS="$CXXFLAGS -DNDEBUG"
 	else
 	   CFLAGS="$CFLAGS -DNDEBUG"
            CXXFLAGS="$CXXFLAGS -DNDEBUG"