From e1cf33faffefe89e6c827aa3b83fdb9087a72eaa Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Wed, 4 Nov 2009 16:43:36 +0100
Subject: [PATCH] Fix Ruby compilation on case-sensitive FS

---
 src/configure    |  8 ++------
 src/configure.in | 10 ++--------
 src/if_ruby.c    |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/configure b/src/configure
index d940525f..7abab31c 100755
--- a/src/configure
+++ b/src/configure
@@ -5761,6 +5761,7 @@ echo "${ECHO_T}$rubyhdrdir" >&6; }
 	  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'`
           if test -d "/System/Library/Frameworks/Ruby.framework"; then
                         RUBY_LIBS="-framework Ruby"
+                        RUBY_CFLAGS=
             librubyarg=
           elif test -f "$rubylibdir/$librubyarg"; then
 	    librubyarg="$rubylibdir/$librubyarg"
@@ -5785,11 +5786,6 @@ echo "${ECHO_T}$rubyhdrdir" >&6; }
 	RUBY_OBJ="objects/if_ruby.o"
 	RUBY_PRO="if_ruby.pro"
 
-                                if test -n "$MACSDK"; then
-          RUBY_CFLAGS=
-          RUBY_LIBS="-framework Ruby"
-        fi
-
 	cat >>confdefs.h <<\_ACEOF
 #define FEAT_RUBY 1
 _ACEOF
@@ -16552,7 +16548,7 @@ echo "${ECHO_T}no" >&6; }
       { echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
 echo $ECHO_N "checking whether we need -D_FORTIFY_SOURCE=1... $ECHO_C" >&6; }
   if test "$gccmajor" -gt "3"; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
     { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   else
diff --git a/src/configure.in b/src/configure.in
index e1b44b0d..a7fcfe4c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1000,6 +1000,8 @@ if test "$enable_rubyinterp" = "yes"; then
           if test -d "/System/Library/Frameworks/Ruby.framework"; then
             dnl On Mac OS X it is safer to just use the -framework flag
             RUBY_LIBS="-framework Ruby"
+            dnl Don't include the -I flag when -framework is set
+            RUBY_CFLAGS=
             librubyarg=
           elif test -f "$rubylibdir/$librubyarg"; then
 	    librubyarg="$rubylibdir/$librubyarg"
@@ -1028,14 +1030,6 @@ if test "$enable_rubyinterp" = "yes"; then
 	RUBY_OBJ="objects/if_ruby.o"
 	RUBY_PRO="if_ruby.pro"
 
-        dnl On Mac OS X, when an SDK has been explicitly chosen we can't rely
-        dnl on any of the search paths set above.  The -framework flag does it
-        dnl all for us.
-        if test -n "$MACSDK"; then
-          RUBY_CFLAGS=
-          RUBY_LIBS="-framework Ruby"
-        fi
-
 	AC_DEFINE(FEAT_RUBY)
       else
 	AC_MSG_RESULT(not found, disabling Ruby)
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 65639390..2b52133d 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -49,7 +49,7 @@
 #endif
 
 #ifdef FEAT_GUI_MACVIM
-# include <Ruby/Ruby.h>
+# include <Ruby/ruby.h>
 #else
 # include <ruby.h>
 #endif
-- 
2.11.4.GIT