--- ncurses-5.6/aclocal.m4	2010-01-07 04:45:17.883223973 +0000
+++ ncurses-5.6/aclocal.m4	2010-01-07 04:38:26.204225400 +0000
@@ -364,15 +364,17 @@
 dnl $2 = default for $LIBS
 AC_DEFUN([CF_BUILD_CC],[
 AC_REQUIRE([CF_PROG_EXT])
-if test "$cross_compiling" = yes ; then
 
-	# defaults that we might want to override
-	: ${BUILD_CFLAGS:=''}
-	: ${BUILD_CPPFLAGS:='ifelse([$1],,,[$1])'}
-	: ${BUILD_LDFLAGS:=''}
-	: ${BUILD_LIBS:='ifelse([$2],,,[$2])'}
-	: ${BUILD_EXEEXT:='$x'}
-	: ${BUILD_OBJEXT:='o'}
+: ${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
 
 	AC_ARG_WITH(build-cc,
 		[  --with-build-cc=XXX     the build C compiler ($BUILD_CC)],
@@ -423,15 +425,6 @@
 Use --with-build-cc to specify the native compiler.])
 	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
 
 AC_SUBST(BUILD_CC)