Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY

Also rearrange some path settings in the Makefile in the process.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 092931a..d6dad19 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -133,11 +133,26 @@ PROGRAMS += git-ssh-pull$X git-ssh-push$X
 
 GIT_LIST_TWEAK =
 
+# Set paths to tools early so that they can be used for version tests.
+ifndef SHELL_PATH
+       SHELL_PATH = /bin/sh
+endif
+ifndef PERL_PATH
+       PERL_PATH = /usr/bin/perl
+endif
+ifndef PYTHON_PATH
+       PYTHON_PATH = /usr/bin/python
+endif
+
 PYMODULES = \
        gitMergeCommon.py
 
 ifdef WITH_OWN_SUBPROCESS_PY
        PYMODULES += compat/subprocess.py
+else
+       ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
+               PYMODULES += compat/subprocess.py
+       endif
 endif
 
 ifdef WITH_SEND_EMAIL
@@ -252,16 +267,6 @@ ifndef NO_CURL
        endif
 endif
 
-ifndef SHELL_PATH
-       SHELL_PATH = /bin/sh
-endif
-ifndef PERL_PATH
-       PERL_PATH = /usr/bin/perl
-endif
-ifndef PYTHON_PATH
-       PYTHON_PATH = /usr/bin/python
-endif
-
 ifndef NO_OPENSSL
        LIB_OBJS += epoch.o
        OPENSSL_LIBSSL = -lssl