[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-920-g950039103

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  950039103686c3ee92d49ff619715c0a8af670ab (commit)
      from  5126bdbf5f395357333305c378aaf8aaad99b8fd (commit)

Summary of changes:
 configure.ac                   | 4 ++++
 src/plugins/python/Makefile.am | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 950039103686c3ee92d49ff619715c0a8af670ab
Author: paul <paul at claws-mail.org>
Date:   Fri Feb 7 14:02:05 2020 +0000

    attempt to fix building the python plugin with python3.8

diff --git a/configure.ac b/configure.ac
index d7aabcd00..672eb47f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1324,11 +1324,15 @@ fi
 
 dnl Python *********************************************************************
 PKG_CHECK_MODULES(PYTHON, python3, HAVE_PYTHON=yes, HAVE_PYTHON=no)
+PKG_CHECK_MODULES(PYTHONEMBED, python3-embed, HAVE_PYTHONEMBED=yes, HAVE_PYTHONEMBED=no)
 PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJ=yes, HAVE_PYGOBJ=no)
 
 AC_SUBST(PYTHON_SHARED_LIB)
 AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHONEMBED_SHARED_LIB)
+AC_SUBST(PYTHONEMBED_CFLAGS)
+AC_SUBST(PYTHONEMBED_LIBS)
 AC_SUBST(PYGOBJECT_CFLAGS)
 AC_SUBST(PYGOBJECT_LIBS)
 
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index 82c502156..74a37ba4c 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -41,6 +41,7 @@ python_la_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(GTK_LIBS) \
 	$(PYGOBJECT_LIBS) \
+	$(PYTHONEMBED_LIBS) \
 	$(PYTHON_LIBS)
 
 
@@ -53,8 +54,9 @@ python_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(ENCHANT_CFLAGS) \
 	$(PYGOBJECT_CFLAGS) \
+	$(PYTHONEMBED_CFLAGS) \
 	$(PYTHON_CFLAGS) \
-	-DPYTHON_SHARED_LIB="\"$(PYTHON_SHARED_LIB)\"" \
+	-DPYTHON_SHARED_LIB="\"$(PYTHONEMBED_SHARED_LIB)\"" \
 	-DENABLE_PYTHON \
 	-fno-strict-aliasing
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail