--- configure.in.orig	2015-03-28 06:31:11.000000000 +0000
+++ configure.in	2015-03-28 08:43:29.000000000 +0000
@@ -1167,6 +1167,15 @@
 	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
 	      dnl remove -ltermcap, it can conflict with an earlier -lncurses
 	      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+	      if test -n "${enable_darwin}" && test "${enable_darwin}" = "no"; then
+		dnl MacOSX build w/o darwin support: Remove CF framework
+		vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed 's/-framework[[ \t]][[ \t]]*CoreFoundation//'`
+		if test -n "${python_LINKFORSHARED}"; then
+		  dnl Since python lib is already specified by an absolute
+		  dnl path, it's safe to remove -lpython?.? in search paths.
+		  vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed "s/-lpython${vi_cv_var_python_version}//"`
+		fi
+	      fi
 	    fi
 	])
 	AC_CACHE_VAL(vi_cv_dll_name_python,