--- src/configure.in.old	2008-12-07 02:58:32.000000000 +0100
+++ src/configure.in	2008-12-07 02:58:58.000000000 +0100
@@ -613,7 +613,11 @@
 AC_MSG_RESULT($enable_pythoninterp)
 if test "$enable_pythoninterp" = "yes"; then
   dnl -- find the python executable
-  AC_PATH_PROG(vi_cv_path_python, python)
+  AC_MSG_CHECKING(--with-python argument)
+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
+        python_name="$withval"; AC_MSG_RESULT($python_name),
+        python_name="python"; AC_MSG_RESULT(no))
+  AC_SUBST(vi_cv_path_python, $python_name)
   if test "X$vi_cv_path_python" != "X"; then
 
     dnl -- get its version number
@@ -690,19 +690,14 @@
 	    dnl -- delete the lines from make about Entering/Leaving directory
 	    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"
-	    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_MODLIBS} ${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//`
-	    fi
+            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_MODLIBS} ${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//`
 	])
 
 	PYTHON_LIBS="${vi_cv_path_python_plibs}"