diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /mesalib/m4/ax_python_module.m4 | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'mesalib/m4/ax_python_module.m4')
| -rw-r--r-- | mesalib/m4/ax_python_module.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/m4/ax_python_module.m4 b/mesalib/m4/ax_python_module.m4 index 3afc40420..2e6670a0f 100644 --- a/mesalib/m4/ax_python_module.m4 +++ b/mesalib/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) |