--- configure.orig	2010-01-06 05:01:40.218505784 +0000
+++ configure	2010-01-06 05:03:47.177505522 +0000
@@ -5681,15 +5681,17 @@
 # compiler, etc., but we need a build compiler to generate parts of the source.
 
 
+: ${BUILD_CC:='${CC}'}
+: ${BUILD_CPP:='${CPP}'}
+: ${BUILD_CFLAGS:='${CFLAGS}'}
+: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+: ${BUILD_LDFLAGS:='${LDFLAGS}'}
+: ${BUILD_LIBS:='${LIBS}'}
+: ${BUILD_EXEEXT:='$x'}
+: ${BUILD_OBJEXT:='o'}
+
 if test "$cross_compiling" = yes ; then
 
-	# defaults that we might want to override
-	: ${BUILD_CFLAGS:=''}
-	: ${BUILD_CPPFLAGS:=''}
-	: ${BUILD_LDFLAGS:=''}
-	: ${BUILD_LIBS:=''}
-	: ${BUILD_EXEEXT:='$x'}
-	: ${BUILD_OBJEXT:='o'}
 
 
 # Check whether --with-build-cc was given.
@@ -5816,15 +5818,6 @@
    { (exit 1); exit 1; }; }
 	fi
 
-else
-	: ${BUILD_CC:='${CC}'}
-	: ${BUILD_CPP:='${CPP}'}
-	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
-	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='${LIBS}'}
-	: ${BUILD_EXEEXT:='$x'}
-	: ${BUILD_OBJEXT:='o'}
 fi