autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling

Unset NO_PYTHON for --with-python without arguments, and when
PYTHON_PATH is set.  Do not check for PYTHON_PATH if it is set
via --with-python=PYTHON_PATH.  Prefer "python" over version
specific names such as "python2.4".

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/configure.ac b/configure.ac
index c2ddd9b6e8faec7aa6c6975024e3ae893c428f88..c27a994da0c3679d16590dde66b603ea4e3670de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,10 @@ AC_ARG_WITH(python,[AS_HELP_STRING([--with-python=PATH], [provide PATH to python
 AS_HELP_STRING([--no-python], [don't use python scripts])],
  [if test "$withval" = "no"; then \
     NO_PYTHON=YesPlease; \
 AS_HELP_STRING([--no-python], [don't use python scripts])],
  [if test "$withval" = "no"; then \
     NO_PYTHON=YesPlease; \

-  elif test "$withval" != "yes"; then \
+  elif test "$withval" = "yes"; then \
+    NO_PYTHON=; \
+  else \
+    NO_PYTHON=; \

     PYTHON_PATH=$withval; \
   fi; \
  ])
     PYTHON_PATH=$withval; \
   fi; \
  ])


@@ -138,15 +141,15 @@ AC_CHECK_PROGS(TAR, [gtar tar])
 # Define NO_PYTHON if you want to lose all benefits of the recursive merge.
 # Define PYTHON_PATH to provide path to Python.
 if test -z "$NO_PYTHON"; then
 # Define NO_PYTHON if you want to lose all benefits of the recursive merge.
 # Define PYTHON_PATH to provide path to Python.
 if test -z "$NO_PYTHON"; then

-       AC_PATH_PROGS(PYTHON_PATH, [python2.4 python2.3 python2 python])
+       if test -z "$PYTHON_PATH"; then
+               AC_PATH_PROGS(PYTHON_PATH, [python python2.4 python2.3 python2])
+       fi

        if test -n "$PYTHON_PATH"; then
                GIT_CONF_APPEND_LINE([PYTHON_PATH=@PYTHON_PATH@])
        if test -n "$PYTHON_PATH"; then
                GIT_CONF_APPEND_LINE([PYTHON_PATH=@PYTHON_PATH@])

-       else
-               GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
+               NO_PYTHON=""

        fi
        fi

-else
-       GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])

 fi
 fi

+GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])

 
 
 ## Checks for libraries.
 
 
 ## Checks for libraries.