--- configure.org	2010-02-16 13:06:04.000000000 +0100
+++ configure	2010-02-25 22:57:08.000000000 +0100
@@ -1103,7 +1103,7 @@
 echo $ac_n "checking whether to enable debugging compiler options""... $ac_c" 1>&6
 echo "configure:1105: checking whether to enable debugging compiler options" >&5
 # Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = TODO_THIS_WILL_NEVER_BE_TRUE; then
   enableval="$enable_debug"
   echo "$ac_t""yes" 1>&6
 	tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'`
@@ -1114,7 +1114,7 @@
   	#CFLAGS="$CFLAGS -Wcast-align -Wcast-qual -Wnested-externs"
   	#CFLAGS="$CFLAGS -Wshadow -Wbad-function-cast -Wwrite-strings"
 	echo "$ac_t""no" 1>&6
-
+	CFLAGS="$ac_save_CFLAGS"
 fi