From 46bad570883d7d6adc68c6582b328c45881c7891 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Mon, 3 May 2004 10:46:49 +0000 Subject: [PATCH] gst/Makefile.am (INCLUDES): Move PYGTK_CFLAGS to common_cflags instead of INCLUDES Original commit message from CVS: * gst/Makefile.am (INCLUDES): Move PYGTK_CFLAGS to common_cflags instead of INCLUDES * configure.ac: define HAVE_OLD_PYGTK if we're on pygtk 2.3.91 or earlier and disable editor checks * gst/common.h: Add backwards compatible typedef for python < 2.3 and pygtk < 2.3.92 --- ChangeLog | 6 +++++- configure.ac | 12 ++++++------ gst/Makefile.am | 4 ++-- gst/gst-argtypes.c | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e768857..22efaad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2004-05-03 Johan Dahlin - * configure.ac: define HAVE_OLD_PYGTK if we're on pygtk 2.3.91 or earlier. + * gst/Makefile.am (INCLUDES): Move PYGTK_CFLAGS to common_cflags + instead of INCLUDES + + * configure.ac: define HAVE_OLD_PYGTK if we're on pygtk 2.3.91 or + earlier and disable editor checks * gst/common.h: Add backwards compatible typedef for python < 2.3 and pygtk < 2.3.92 diff --git a/configure.ac b/configure.ac index 797e27a..7f7967f 100644 --- a/configure.ac +++ b/configure.ac @@ -100,12 +100,12 @@ AC_SUBST(GST_PLAY_CFLAGS) AC_SUBST(GST_PLAY_LIBS) dnl Editor -AC_MSG_CHECKING(for GStreamer editor include dir) -PKG_CHECK_MODULES(GST_EDITOR, gst-editor-libs >= 0.7.0, - HAVE_EDITOR=yes,HAVE_EDITOR=no) -AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes") -AC_SUBST(GST_EDITOR_CFLAGS) -AC_SUBST(GST_EDITOR_LIBS) +dnl AC_MSG_CHECKING(for GStreamer editor include dir) +dnl PKG_CHECK_MODULES(GST_EDITOR, gst-editor-libs >= 0.7.0, +dnl HAVE_EDITOR=yes,HAVE_EDITOR=no) +dnl AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes") +dnl AC_SUBST(GST_EDITOR_CFLAGS) +dnl AC_SUBST(GST_EDITOR_LIBS) AC_CHECK_PROG(HAVE_XMLTO, xmlto, true, false) AC_CHECK_PROG(HAVE_XMLCATALOG, xmlcatalog, true, false) diff --git a/gst/Makefile.am b/gst/Makefile.am index 77c45f6..5f92c58 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -1,4 +1,4 @@ -common_cflags = $(GST_CFLAGS) -fno-strict-aliasing +common_cflags = $(PYGTK_CFLAGS) $(GST_CFLAGS) -fno-strict-aliasing common_libadd = $(GST_LIBS) common_ldflags = -module -avoid-version @@ -25,7 +25,7 @@ endif defs_DATA = gst-types.defs defsdir = $(pkgdatadir)/2.0/defs -INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) +INCLUDES = $(PYTHON_INCLUDES) EXTRA_DIST = $(defs_DATA) arg-types.py PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ diff --git a/gst/gst-argtypes.c b/gst/gst-argtypes.c index 67364b8..7f2d40b 100644 --- a/gst/gst-argtypes.c +++ b/gst/gst-argtypes.c @@ -20,7 +20,7 @@ */ #include -#include +#include "common.h" gboolean pygst_data_from_pyobject(PyObject *object, GstData **data) -- 2.7.4