mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/Makefile.am (INCLUDES): Move PYGTK_CFLAGS to common_cflags instead of INCLUDES

Browse source 
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
This commit is contained in:
Johan Dahlin 2004-05-03 10:46:49 +00:00
parent 338d44b674
commit 46bad57088
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,6 +1,10 @@
2004-05-03 Johan Dahlin <johan@gnome.org> 2004-05-03 Johan Dahlin <johan@gnome.org>
* 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 * gst/common.h: Add backwards compatible typedef for python < 2.3
and pygtk < 2.3.92 and pygtk < 2.3.92

12
configure.ac
View file

@ -100,12 +100,12 @@ AC_SUBST(GST_PLAY_CFLAGS)
AC_SUBST(GST_PLAY_LIBS) AC_SUBST(GST_PLAY_LIBS)
dnl Editor dnl Editor
AC_MSG_CHECKING(for GStreamer editor include dir) dnl AC_MSG_CHECKING(for GStreamer editor include dir)
PKG_CHECK_MODULES(GST_EDITOR, gst-editor-libs >= 0.7.0, dnl PKG_CHECK_MODULES(GST_EDITOR, gst-editor-libs >= 0.7.0,
HAVE_EDITOR=yes,HAVE_EDITOR=no) dnl HAVE_EDITOR=yes,HAVE_EDITOR=no)
AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes") dnl AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes")
AC_SUBST(GST_EDITOR_CFLAGS) dnl AC_SUBST(GST_EDITOR_CFLAGS)
AC_SUBST(GST_EDITOR_LIBS) dnl AC_SUBST(GST_EDITOR_LIBS)
AC_CHECK_PROG(HAVE_XMLTO, xmlto, true, false) AC_CHECK_PROG(HAVE_XMLTO, xmlto, true, false)
AC_CHECK_PROG(HAVE_XMLCATALOG, xmlcatalog, true, false) AC_CHECK_PROG(HAVE_XMLCATALOG, xmlcatalog, true, false)

4
gst/Makefile.am
View file

@ -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_libadd = $(GST_LIBS)
common_ldflags = -module -avoid-version common_ldflags = -module -avoid-version
@ -25,7 +25,7 @@ endif
defs_DATA = gst-types.defs defs_DATA = gst-types.defs
defsdir = $(pkgdatadir)/2.0/defs defsdir = $(pkgdatadir)/2.0/defs
INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) INCLUDES = $(PYTHON_INCLUDES)
EXTRA_DIST = $(defs_DATA) arg-types.py EXTRA_DIST = $(defs_DATA) arg-types.py
PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ PYGTK_DEFSDIR = @PYGTK_DEFSDIR@

2
gst/gst-argtypes.c
View file

@ -20,7 +20,7 @@
*/ */
#include <gst/gst.h> #include <gst/gst.h>
#include <pygobject.h> #include "common.h"
gboolean gboolean
pygst_data_from_pyobject(PyObject *object, GstData **data) pygst_data_from_pyobject(PyObject *object, GstData **data)