[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - configure.ac

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 12 08:02:53 UTC 2019


 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 582f45bb9a80300158f73254d66f661b196b3732
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 10 20:11:48 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 12 10:01:52 2019 +0200

    Related: rhbz#1718063 look for pkg-config python-version-embed
    
    Change-Id: I7048171501e32d29f9d5a58f0d5fc0b96b318a4e
    Reviewed-on: https://gerrit.libreoffice.org/73809
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 77cbacb109b6..39dd082b8366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8574,6 +8574,9 @@ if test $enable_python = system; then
         if test -z "$PKG_CONFIG"; then
             PYTHON_CFLAGS="-I$python_include"
             PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
+        elif $PKG_CONFIG --exists python-$python_version-embed; then
+            PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version-embed`"
+            PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version-embed` $python_libs"
         elif $PKG_CONFIG --exists python-$python_version; then
             PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`"
             PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version` $python_libs"


More information about the Libreoffice-commits mailing list