sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Use PYTHON_VER rather than PYTHON_VERSION, as the first is already

Browse Source 
commonly used (e.g. in the FreeBSD ports system).

Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
This commit is contained in:
Timur I. Bakeyev 2009-05-13 01:59:04 +02:00 committed by Jelmer Vernooij
parent 7403dd39d6
commit d9f1b2ceec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
m4/check_python.m4
View File

@ -3,7 +3,7 @@ dnl
dnl Copyright (C) 2007-2008 Jelmer Vernooij <jelmer@samba.org> dnl Copyright (C) 2007-2008 Jelmer Vernooij <jelmer@samba.org>
dnl Published under the GNU GPL, v3 or later dnl Published under the GNU GPL, v3 or later
dnl dnl
AC_ARG_VAR([PYTHON_VERSION],[The installed Python AC_ARG_VAR([PYTHON_VER],[The installed Python
version to use, for example '2.3'. This string version to use, for example '2.3'. This string
will be appended to the Python interpreter will be appended to the Python interpreter
canonical name.]) canonical name.])
@ -42,10 +42,10 @@ dnl $PYTHON_CFLAGS
dnl $PYTHON_LDFLAGS dnl $PYTHON_LDFLAGS
AC_DEFUN([AC_SAMBA_PYTHON_DEVEL], AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
[ [
if test -z "$PYTHON_VERSION"; then if test -z "$PYTHON_VER"; then
AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python]) AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python])
else else
AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) AC_PATH_PROG([PYTHON],[python[$PYTHON_VER]])
fi fi
if test -z "$PYTHON"; then if test -z "$PYTHON"; then
working_python=no working_python=no
@ -55,10 +55,10 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
dnl assume no working python dnl assume no working python
working_python=no working_python=no
if test -z "$PYTHON_VERSION"; then if test -z "$PYTHON_VER"; then
AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config]) AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
else else
AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config]) AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VER]-config])
fi fi
if test -z "$PYTHON_CONFIG"; then if test -z "$PYTHON_CONFIG"; then