[Libreoffice-commits] core.git: configure.ac

[Matúš Kukan]

 configure.ac |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 40f92a3cbe817db09d10eff856002962c0b5e906
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Mar 18 12:09:49 2013 +0100

    use only internal python on cygwin
    
    Change-Id: Ibcfa5030a245e1bbc00c01c4d42a5bba01ec9aa9

diff --git a/configure.ac b/configure.ac
index 95f548a..18490cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7264,12 +7264,14 @@ AC_SUBST([MINGW_ZLIB_DLL])
 # Optionally user can pass an option to configure, i. e.
 # ./configure PYTHON=/usr/bin/python
 # =====================================================================
-# This allows a lack of system python with no error, we use internal one in that case.
-AM_PATH_PYTHON([2.6],, [:])
-# Clean PYTHON_VERSION checked below if cross-compiling
-PYTHON_VERSION=""
-if test "$PYTHON" != ":"; then
-    PYTHON_FOR_BUILD=$PYTHON
+if test "$build_os" != "cygwin"; then
+    # This allows a lack of system python with no error, we use internal one in that case.
+    AM_PATH_PYTHON([2.6],, [:])
+    # Clean PYTHON_VERSION checked below if cross-compiling
+    PYTHON_VERSION=""
+    if test "$PYTHON" != ":"; then
+        PYTHON_FOR_BUILD=$PYTHON
+    fi
 fi
 AC_SUBST(PYTHON_FOR_BUILD)