From a396b2f7bfdae870ad558d2cc27072e5747bcb6f Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Wed, 2 Sep 2009 00:26:42 +0200
Subject: [PATCH] Ensure Vim compiles as 32 bit

The MacVim binary always builds as 32 bit so make sure the Vim binary is
32 bit as well (GCC defaults to 64 bit on Leopard).
---
 src/configure    | 27 +++++++++++++++------------
 src/configure.in |  5 +++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/configure b/src/configure
index 7d6540563f..461f9b5c81 100755
--- a/src/configure
+++ b/src/configure
@@ -3177,7 +3177,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 _ACEOF
-rm -f conftest*
+rm -f -r conftest*
  { echo "$as_me:$LINENO: checking for library containing strerror" >&5
 echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
 if test "${ac_cv_search_strerror+set}" = set; then
@@ -3411,7 +3411,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -3432,7 +3432,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -6217,7 +6217,7 @@ _ACEOF
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib la dll; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -6370,7 +6370,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
+  for ac_extension in a so sl dylib la dll; do
     if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
@@ -8226,6 +8226,9 @@ echo $ECHO_N "checking for MacVim GUI... $ECHO_C" >&6; }
 echo "${ECHO_T}yes" >&6; };
     GUITYPE=MACVIMGUI
         datadir='${prefix}/MacVim.app/Contents/Resources'
+
+            CFLAGS="$CFLAGS -m32"
+    LDFLAGS="$LDFLAGS -m32"
   fi
 
   if test "$VIMNAME" = "vim"; then
@@ -9861,7 +9864,7 @@ else
   { echo "$as_me:$LINENO: result: no; xim has been disabled" >&5
 echo "${ECHO_T}no; xim has been disabled" >&6; }; enable_xim = "no"
 fi
-rm -f conftest*
+rm -f -r conftest*
 
   fi
   CPPFLAGS=$cppflags_save
@@ -11474,7 +11477,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_prog_gcc_traditional=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
@@ -11491,7 +11494,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "$ac_pattern" >/dev/null 2>&1; then
   ac_cv_prog_gcc_traditional=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
   fi
 fi
@@ -11940,7 +11943,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -12175,7 +12178,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_type_rlim_t=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 	  { echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
 echo "${ECHO_T}$ac_cv_type_rlim_t" >&6; }
@@ -12213,7 +12216,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_type_stack_t=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 	  { echo "$as_me:$LINENO: result: $ac_cv_type_stack_t" >&5
 echo "${ECHO_T}$ac_cv_type_stack_t" >&6; }
@@ -13126,7 +13129,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ptys=`echo $pdir/pty??`
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 if test "$ptys" != "$pdir/pty??" ; then
   p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
diff --git a/src/configure.in b/src/configure.in
index f57817124f..a7d40580b5 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1460,6 +1460,11 @@ if test "x$MACOSX" = "xyes"; then
     GUITYPE=MACVIMGUI
     dnl Sorry for the hard coded default
     datadir='${prefix}/MacVim.app/Contents/Resources'
+
+    dnl Mac OS X 10.6 compiles 64 bit by default, but the MacVim binary is 32
+    dnl bit.  This ensures Vim is 32 bit as well.
+    CFLAGS="$CFLAGS -m32"
+    LDFLAGS="$LDFLAGS -m32"
   fi
 
   if test "$VIMNAME" = "vim"; then