[Libreoffice-commits] .: 2 commits - configure.in solenv/inc

[Robert Nagy]

 configure.in           |    3 ++-
 solenv/inc/settings.mk |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 611901b5fae1f221b4f913f39a939550b6de80ea
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Dec 5 14:27:10 2010 +0100

    fix PYTHON_LIBS
    
    on some platforms there are extra libs needed when linking with -lpython,
    for example -pthread and -lutil on OpenBSD

diff --git a/configure.in b/configure.in
index 0e3b94b..d875950 100644
--- a/configure.in
+++ b/configure.in
@@ -4489,8 +4489,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_CFLAGS="-I$python_include"
-   PYTHON_LIBS="-lpython$python_version"
+   PYTHON_LIBS="-lpython$python_version $python_libs"
 fi
 if test "$with_system_python" = "yes" ; then
    SYSTEM_PYTHON=YES
commit 672bed486bc5951fc9e2cb11162ff757e60a96bb
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Dec 5 14:08:26 2010 +0100

    use AUGMENT_LIBRARY_PATH_LOCAL for regcomp

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index a276cf4..559c984 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1054,7 +1054,7 @@ REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
 GDBREGCOMPTRACE=$(GDBTRACE)
 .ENDIF
 
-REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
+REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
 CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
 JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker