From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: [PATCH 3/4] autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
Date: Tue, 8 Aug 2006 18:38:06 +0200 [thread overview]
Message-ID: <200608081838.06311.jnareb@gmail.com> (raw)
In-Reply-To: <200608081834.09271.jnareb@gmail.com>
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 to python2.4 etc.
Signed-off-by: Jakub Narebski <jnareb@gmail•com>
---
What might be unexpected is the fact that even for --with-python
(but only without setting PYTHON_PATH) autodetection might set NO_PYTHON
configure.ac | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index c2ddd9b..c27a994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,10 @@ AC_ARG_WITH(python,[AS_HELP_STRING([--wi
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; \
])
@@ -138,15 +141,15 @@ #
# 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@])
- else
- GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
+ NO_PYTHON=""
fi
-else
- GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
fi
+GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
## Checks for libraries.
--
1.4.1.1
next prev parent reply other threads:[~2006-08-08 16:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-08 16:34 [PATCH 0/4] autoconf: Some improvements Jakub Narebski
2006-08-08 16:35 ` [PATCH 1/4] autoconf: Add configure target to main Makefile Jakub Narebski
2006-08-08 16:48 ` [PATCH 5/4] autoconf: Mention "make configure" instead of "autoconf" in INSTALL Jakub Narebski
2006-08-08 16:36 ` [PATCH 2/4] autoconf: Error out on --without-shell and --without-perl Jakub Narebski
2006-08-08 16:38 ` Jakub Narebski [this message]
2006-08-08 16:39 ` [PATCH 4/4] autoconf: Move variables which we always set to config.mak.in Jakub Narebski
2006-08-08 23:42 ` [PATCH 6/4] autoconf: Add forgotten NO_OPENSSL=@NO_OPENSSL@ " Jakub Narebski
2006-08-08 20:43 ` [PATCH] autoconf: clean temporary file mak.append Junio C Hamano
2006-08-08 20:58 ` Jakub Narebski
2006-08-08 21:35 ` Junio C Hamano
2006-08-09 0:15 ` [PATCH 7] autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR Jakub Narebski
2006-08-10 10:50 ` Jakub Narebski
2006-08-10 21:27 ` Junio C Hamano
2006-08-10 21:43 ` Jakub Narebski
2006-08-09 0:19 ` [PATCH 8] autoconf: It is --without-python, not --no-python Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200608081838.06311.jnareb@gmail.com \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox