--- build-app.sh.old	2009-09-28 16:00:51.000000000 -0600
+++ build-app.sh	2009-09-28 15:46:12.000000000 -0600
@@ -2,7 +2,7 @@
 
 carbondir="`pwd`"
 
-(cd xpm; make)
+(cd xpm; make CFLAGS="-arch i386 -O")
 
 cd ..
 
@@ -14,7 +14,7 @@
 
 #./configure --without-kkcc --without-mc-alloc --with-carbon --with-mule --without-ldap --enable-error-checking=none --prefix=${carbondir}/XEmacs.app/Contents/Resources --with-cflags=-DDONT_EXTERN_INLINE_HEADER_FUNCTIONS
 #./configure --with-dump-in-exec --with-carbon --with-mule --without-ldap --enable-error-checking=none --prefix=${carbondir}/XEmacs.app/Contents/Resources --with-cflags=-DDONT_EXTERN_INLINE_HEADER_FUNCTIONS
-./configure --without-kkcc --without-mc-alloc --with-carbon --with-mule --without-ldap --enable-error-checking=none --with-optimization --with-cflags-optimization=-O2 --prefix=${carbondir}/XEmacs.app/Contents/Resources --with-cflags=-DDONT_EXTERN_INLINE_HEADER_FUNCTIONS
+./configure --without-kkcc --without-mc-alloc --with-carbon --with-mule --without-ldap --enable-error-checking=none --with-optimization --with-cflags-optimization=-O2 --prefix=${carbondir}/XEmacs.app/Contents/Resources --with-cflags=-DDONT_EXTERN_INLINE_HEADER_FUNCTIONS --with-cflags="-arch i386" --with-ldflags="-arch i386"
 #./configure --with-dump-in-exec --with-carbon --with-mule --without-ldap --enable-error-checking=none --with-optimization --with-cflags-optimization=-O2 --prefix=${carbondir}/XEmacs.app/Contents/Resources --with-cflags=-DDONT_EXTERN_INLINE_HEADER_FUNCTIONS
 
 mkdir -p ${carbondir}/XEmacs.app/Contents/MacOS