[Libreoffice-commits] .: configure.in

[Robert Nagy]

 configure.in |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3bce92d7e0ddfa59e642a2a6f4bab6f63ee1f90f
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Apr 5 17:30:07 2011 +0200

    merge the new way of handling python ldflags from libreoffice-3-4

diff --git a/configure.in b/configure.in
index 50ea5e1..94626f1 100755
--- a/configure.in
+++ b/configure.in
@@ -4117,11 +4117,12 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \
    AC_MSG_RESULT([external])
    AM_PATH_PYTHON([2.2])
 
-   python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
-   python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
-   python_libs=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS');"`
+   python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+   python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+   python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
+   python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
    PYTHON_CFLAGS="-I$python_include"
-   PYTHON_LIBS="-lpython$python_version $python_libs"
+   PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
 fi
 if test "$with_system_python" = "yes" ; then
    SYSTEM_PYTHON=YES