[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - configure.in

[Robert Nagy]

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

New commits:
commit 00e44fe20767db5a0e777ff7b4176a7079053032
Merge: 2b03888... bd88391...
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Apr 5 17:26:18 2011 +0200

    Merge branch 'libreoffice-3-4' of git://anongit.freedesktop.org/git/libreoffice/bootstrap into libreoffice-3-4

commit 2b03888a918b7020a1f9330686dc531222057573
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Apr 5 17:21:10 2011 +0200

    fix linking to the python library (use -L$PYLIBDIR -lpython$pyver)
    
    as far as i saw the reason to use an absolute path for linking instead
    of using -lpythonX.XX is that at least debian does not ship a shared
    object within the basic python3 package so you have to install the -dev
    package (that's kinda weird^H^H^H^H^Hf***ed up).

diff --git a/configure.in b/configure.in
index a49bd88..c9dd470 100755
--- a/configure.in
+++ b/configure.in
@@ -4120,9 +4120,9 @@ elif test -n "$with_system_python" -o -n "$with_system_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_ldlib=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR') + '/' + distutils.sysconfig.get_config_var('LDLIBRARY'));"`
+   python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
    PYTHON_CFLAGS="-I$python_include"
-   PYTHON_LIBS="$python_ldlib $python_libs"
+   PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
 fi
 if test "$with_system_python" = "yes" ; then
    SYSTEM_PYTHON=YES