[pitivi] Revert "coptimisations: Properly link against python3"
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Revert "coptimisations: Properly link against python3"
- Date: Wed, 23 Sep 2015 10:36:08 +0000 (UTC)
commit c701446dcb759805b78ccfd0100e934c30f0da02
Author: Thibault Saunier <tsaunier gnome org>
Date: Wed Sep 23 12:35:31 2015 +0200
Revert "coptimisations: Properly link against python3"
This reverts commit c6f84b192b2a79012361cd33ea5dd395db19ff3d.
After some conversation in
https://bugzilla.gnome.org/show_bug.cgi?id=755434 it was decided that
it was a bad idea :)
configure.ac | 1 -
pitivi/coptimizations/Makefile.am | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6d5bccc..c2f719f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,6 @@ AS_IF([test "x$HAVE_GSTREAMER" = xno],
PKG_CHECK_MODULES([cairo], [cairo])
PKG_CHECK_MODULES([py3cairo], [py3cairo])
-PKG_CHECK_MODULES([python3], [python3])
AC_ARG_ENABLE(help,
AS_HELP_STRING([--disable-help],[disable help]),
diff --git a/pitivi/coptimizations/Makefile.am b/pitivi/coptimizations/Makefile.am
index 494f29b..e11a801 100644
--- a/pitivi/coptimizations/Makefile.am
+++ b/pitivi/coptimizations/Makefile.am
@@ -2,5 +2,7 @@ pyexec_LTLIBRARIES = renderer.la
renderer_la_SOURCES = renderer.c
pyexecdir = $(libdir)/pitivi/python/pitivi/timeline/
-renderer_la_CFLAGS = $(cairo_CFLAGS) $(py3cairo_CFLAGS) $(python3_CFLAGS)
-renderer_la_LDFLAGS = -module -avoid-version $(LIBS) $(cairo_LIBS) $(py3cairo_LIBS) $(python3_LIBS)
+AM_CFLAGS = $(cairo_CFLAGS) $(py3cairo_CFLAGS)
+LIBS = $(cairo_LIBS) $(py3cairo_LIBS)
+renderer_la_CFLAGS = $(PYTHON_CFLAGS) $(AM_CFLAGS)
+renderer_la_LDFLAGS = -module -avoid-version $(LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]