--- configure.org	2009-11-04 19:57:42.000000000 -0600
+++ configure	2010-02-18 11:33:51.000000000 -0600
@@ -6736,7 +6736,7 @@
 
 
 # Some default environment variable values
-CFLAGS="-Wall -pedantic"
+CFLAGS="$CFLAGS -Wall -pedantic"
 
 # use -Wextra when possible
 { $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Wextra" >&5
@@ -8226,7 +8226,8 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr='
+'
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
