--- configure.old	2004-01-03 08:53:39.000000000 -0600
+++ configure	2006-05-18 10:27:59.000000000 -0500
@@ -129,8 +129,8 @@
 #
 # 0. Figure out architecture (one of i386, alpha, sparc, arm, m68k, mips)
 #
-ARCH=`uname -m | sed s/i.86/i386/`
-echo "ARCH=$ARCH" >> make_include
+ARCH=`$CC -dumpmachine | awk -F- '{print $1}'`
+echo "ARCH=${ARCH/i?86/i386}" >> make_include
 
 #
 # 1. Do we have <locale.h>?