configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ba26c5e6330f5f1f38aab698b2b2c32cac7b5df3
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Mon May 13 08:24:49 2013 +0200
configure.ac: don't use python2 values for python3
unset more internal python-related variables, so that the test for
runtime-python >=3 does not reuse *any* value from test for build-python >= 2.5
Change-Id: I508292713d582476db70fcd2b05ce0abb300f38a
diff --git a/configure.ac b/configure.ac
index efa1b77..dc578d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7462,7 +7462,7 @@ no|disable)
else
# Unset variables set by the above AM_PATH_PYTHON so that
# we actually do check anew.
- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
am_cv_python_version am_cv_python_platform am_cv_python_pythondir
am_cv_python_pyexecdir
AM_PATH_PYTHON([3.3],, [:])
if test "$PYTHON" = :; then
AC_MSG_RESULT([internal])
@@ -7515,7 +7515,7 @@ if test $enable_python = system; then
elif test "$cross_compiling" != yes; then
# Unset variables set by the above AM_PATH_PYTHON so that
# we actually do check anew.
- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
am_cv_python_version am_cv_python_platform am_cv_python_pythondir
am_cv_python_pyexecdir
# This causes an error if no python command is found
AM_PATH_PYTHON([3.3])
python_include=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
