Skip to content

Commit

Permalink
Use PYTHON_VER rather than PYTHON_VERSION, as the first is already
Browse files Browse the repository at this point in the history
commonly used (e.g. in the FreeBSD ports system).

Signed-Off-By: Jelmer Vernooij <[email protected]>
  • Loading branch information
b-a-t authored and jelmer committed May 13, 2009
1 parent 7403dd3 commit d9f1b2c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions m4/check_python.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dnl
dnl Copyright (C) 2007-2008 Jelmer Vernooij <[email protected]>
dnl Published under the GNU GPL, v3 or later
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
will be appended to the Python interpreter
canonical name.])
Expand Down Expand Up @@ -42,10 +42,10 @@ dnl $PYTHON_CFLAGS
dnl $PYTHON_LDFLAGS
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])
else
AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
AC_PATH_PROG([PYTHON],[python[$PYTHON_VER]])
fi
if test -z "$PYTHON"; then
working_python=no
Expand All @@ -55,10 +55,10 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
dnl assume no working python
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])
else
AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config])
AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VER]-config])
fi
if test -z "$PYTHON_CONFIG"; then
Expand Down

0 comments on commit d9f1b2c

Please sign in to comment.