From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 22 Jul 2009 09:17:23 +0000 (+0000)
Subject: updated for version 7.2-236
X-Git-Tag: v7.2.236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=996b6d86cc6cb108f6a48c474dd7116dccb5f4f9;p=vim

updated for version 7.2-236
---

diff --git a/src/auto/configure b/src/auto/configure
index 42f4784dd..1049c0ceb 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5780,7 +5780,10 @@ $as_echo "$rubyhdrdir" >&6; }
 	fi
 	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
 	if test "X$rubyldflags" != "X"; then
-	  LDFLAGS="$rubyldflags $LDFLAGS"
+	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+	  if test "X$rubyldflags" != "X"; then
+	    LDFLAGS="$rubyldflags $LDFLAGS"
+	  fi
 	fi
 	RUBY_SRC="if_ruby.c"
 	RUBY_OBJ="objects/if_ruby.o"
diff --git a/src/configure.in b/src/configure.in
index eb7db7674..1ad32d7a3 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -984,7 +984,13 @@ if test "$enable_rubyinterp" = "yes"; then
 	fi
 	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
 	if test "X$rubyldflags" != "X"; then
-	  LDFLAGS="$rubyldflags $LDFLAGS"
+	  dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only
+	  dnl be included if requested by passing --with-mac-arch to
+	  dnl configure, so strip these flags first (if present)
+	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+	  if test "X$rubyldflags" != "X"; then
+	    LDFLAGS="$rubyldflags $LDFLAGS"
+	  fi
 	fi
 	RUBY_SRC="if_ruby.c"
 	RUBY_OBJ="objects/if_ruby.o"
diff --git a/src/version.c b/src/version.c
index 8e5594266..fc4da307b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    236,
 /**/
     235,
 /**/