diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-05 14:00:07 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-05 08:06:04 -0600 |
| commit | e652fc802a13ead5e3b0ef7c2b4a6976ab0e1ec6 (patch) | |
| tree | 014ee8208255304b65ae8830003c41fa4c569751 /source4/scripting/python | |
| parent | df70180c0ff55a526cec997b6a9fc550cf2719d6 (diff) | |
| download | samba-e652fc802a13ead5e3b0ef7c2b4a6976ab0e1ec6.tar.gz samba-e652fc802a13ead5e3b0ef7c2b4a6976ab0e1ec6.tar.bz2 samba-e652fc802a13ead5e3b0ef7c2b4a6976ab0e1ec6.zip | |
r26666: python: Prefer newer Python versions as they use const properly.
(This used to be commit aa2adf33275dc637022d9feee1531aa79aa08e25)
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/config.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4 index a629aa8f92..326cef8440 100644 --- a/source4/scripting/python/config.m4 +++ b/source4/scripting/python/config.m4 @@ -13,7 +13,12 @@ if test -z "$PYTHON"; then AC_MSG_WARN([No python found]) fi -AC_PATH_PROG([PYTHON_CONFIG],[python[$PYTHON_VERSION]-config]) +if test -z "$PYTHON_VERSION"; then + AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config]) +else + AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config]) +fi + if test -z "$PYTHON_CONFIG"; then working_python=no AC_MSG_WARN([No python-config found]) |