diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-01-21 10:42:50 -0800 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-02-13 18:46:39 +0100 |
| commit | 1151cdfa9eede5f8b69865d5764b5aa3eb3f1cf7 (patch) | |
| tree | 8a68330761169395136b2cc973c1491dfba7a9ab | |
| parent | ffaa1c92e9029efdc3ab5ff459cc34f9364444a9 (diff) | |
build: Fix build on systems where /usr/bin/python isn't python 2.
configure.ac sets up a PYTHON2 variable, which is what we want
AX_PYTHON_MODULE to use (since we only use Python 2 for now).
NOTE: This is a candidate for the 9.0 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31598
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
(cherry picked from commit 121d19de920212225586c9269f2d34ab7e6e1aec)
| -rw-r--r-- | m4/ax_python_module.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4 index 3afc404204..2e6670a0f5 100644 --- a/m4/ax_python_module.m4 +++ b/m4/ax_python_module.m4 @@ -25,13 +25,13 @@ AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) AC_DEFUN([AX_PYTHON_MODULE],[ - if test -z $PYTHON; + if test -z $PYTHON2; then - PYTHON="python" + PYTHON2="python" fi - PYTHON_NAME=`basename $PYTHON` + PYTHON_NAME=`basename $PYTHON2` AC_MSG_CHECKING($PYTHON_NAME module: $1) - $PYTHON -c "import $1" 2>/dev/null + $PYTHON2 -c "import $1" 2>/dev/null if test $? -eq 0; then AC_MSG_RESULT(yes) |