[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.in vcl/source

[Jürgen Schmidt]

 configure.in             |   16 ++++++++++++++--
 vcl/source/app/svapp.cxx |    4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 74e54220a6341ef9f100128556106b698388295a
Author: Jürgen Schmidt <j...@apache.org>
Date:   Fri Nov 15 08:31:04 2013 +0000

    adapt Python section for MacOS

diff --git a/configure.in b/configure.in
index b1bc76a..2fca76f 100644
--- a/configure.in
+++ b/configure.in
@@ -4048,15 +4048,27 @@ if test "$_os" = "Darwin" && test "$with_system_python" 
!= "no"; then
    with_system_python=yes
 
    _python="/Library/Frameworks/Python.framework/Versions/Current/bin/python" 
+   if test ! -f $_python; then
+         _python="/usr/bin/python"
+   fi
+   AC_MSG_RESULT([compiling against system python ($_python)])
+
    _python_hexversion=`$_python -c "import sys; print(sys.hexversion);"`
-   
+ 
    dnl hex version of Python 2.7.1 = 34013680
    if test $_python_hexversion -ge 34013680 ; then
+         _python_version=`$_python -c "import sys; print sys.version;" | head 
-n 1`
       AC_MSG_RESULT([compiling against system python (version 
$_python_version)])
 
          _python_ver=`$_python -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('VERSION'));"`
          
-         
PYTHON_CFLAGS="-I/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
+         if test -d 
"/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver";
 then
+                
PYTHON_CFLAGS="-I/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
+         elif test -d 
"/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver";
 then
+                
PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
  
+         else
+                
PYTHON_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
+         fi
    else
                AC_MSG_ERROR([Python 2.7.1 or higher is required])
    fi
commit 9cf2b1706af6ad55ec80ba3148e5a3738c4d33c6
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date:   Fri Nov 15 08:06:44 2013 +0000

    fix build breaker on non-Windows platforms

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 32992af..f538ebd 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2140,8 +2140,8 @@ bool Application::EnableAccessInterface(bool bEnable)
 #ifdef WNT
     return WNTEnableAccessInterface(bEnable);
 #else
-    bEnable = TRUE; // avoid compiler warning
-    return TRUE;
+    bEnable = true; // avoid compiler warning
+    return true;
 #endif
 }
 bool Application::IsEnableAccessInterface()

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits