--- nightfall-1.82/configure.orig	2014-07-04 00:31:07.000000000 +0200
+++ nightfall-1.82/configure	2014-07-04 00:32:20.000000000 +0200
@@ -10404,18 +10404,15 @@
 
 
 if test "x$GCC" = "xyes"; then
-  if test ! -z "`echo " $CFLAGS" | grep ' \-g ' 2> /dev/null`" ; then
-    CFLAGS=`echo " $CFLAGS" | sed 's% \-g %%' `
-  fi
-  if test ! -z "`echo "$CFLAGS" | grep "\-O2" 2> /dev/null`" ; then
-    CFLAGS=`echo $CFLAGS | sed 's%\-O2%%' `
-  fi
-  if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
-    CFLAGS="$CFLAGS -Wall"
-  fi
-  if test -z "`echo "$CFLAGS" | grep "\-O3" 2> /dev/null`" ; then
-    CFLAGS="$CFLAGS -O3"
-  fi
+
+    if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+	CFLAGS="$CFLAGS -Wall"
+    fi
+
+    if test -z "`echo "$CFLAGS" | grep "\-fforce\-addr" 2> /dev/null`" ; then
+	CFLAGS="$CFLAGS -fforce-addr"
+    fi
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -fforce-addr" >&5
 $as_echo_n "checking whether ${CC} accepts -fforce-addr... " >&6; }
 if ${ffa_cv_cc+:} false; then :