macvim-macports-python.diff

--- src/configure 2013-05-02 18:03:49.000000000 -0400
+++ src/configure	2013-05-02 18:49:20.000000000 -0400
@@ -773,6 +793,7 @@
 with_plthome
 enable_perlinterp
 enable_pythoninterp
+with_python
 with_python_config_dir
 enable_python3interp
 with_python3_config_dir
@@ -1486,6 +1505,7 @@
   --with-compiledby=NAME  name to show in :version message
   --with-lua-prefix=PFX   Prefix where Lua is installed.
   --with-plthome=PLTHOME   Use PLTHOME.
+  --with-python=PATH       which python to use (default: python)
   --with-python-config-dir=PATH  Python's config directory
   --with-python3-config-dir=PATH  Python's config directory
   --with-tclsh=PATH       which tclsh to use (default: tclsh8.0)
@@ -5246,45 +5301,19 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
 $as_echo "$enable_pythoninterp" >&6; }
 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
-    # Extract the first word of "python", so it can be a program name with args.
-set dummy python; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_vi_cv_path_python+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $vi_cv_path_python in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_vi_cv_path_python="$vi_cv_path_python" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_vi_cv_path_python="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python argument" >&5
+$as_echo_n "checking --with-python argument... " >&6; }
 
-  ;;
-esac
-fi
-vi_cv_path_python=$ac_cv_path_vi_cv_path_python
-if test -n "$vi_cv_path_python"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5
-$as_echo "$vi_cv_path_python" >&6; }
+# Check whether --with-python was given.
+if test "${with_python+set}" = set; then :
+  withval=$with_python; python_name="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_name" >&5
+$as_echo "$python_name" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  python_name="python"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
+  vi_cv_path_python=$python_name
 
   if test "X$vi_cv_path_python" != "X"; then
 
@@ -5395,18 +5424,13 @@
 eof
 	    	    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
 	    rm -f -- "${tmp_mkf}"
-	    if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
-		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
-	      vi_cv_path_python_plibs="-framework Python"
+	    if test "${vi_cv_var_python_version}" = "1.4"; then
+	      vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
 	    else
-	      if test "${vi_cv_var_python_version}" = "1.4"; then
-		  vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
-	      else
-		  vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
-	      fi
-	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
-	      	      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+	      vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
 	    fi
+	    vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+	    	    vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
 
 fi