mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 18:23:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: If pygobject is available, only build with it, else try to find pygtk to stay compatible with older ver...

Browse source 
Original commit message from CVS:
* configure.ac:
If pygobject is available, only build with it, else try to find pygtk
to stay compatible with older version.
* gst/Makefile.am:
Switch to pygobject CFLAGS.
* testsuite/Makefile.am:
Switch to pygobject CFLAGS.
This commit is contained in:
Edward Hervey 2006-08-21 11:31:51 +00:00
parent c070c75beb
commit bc234e3800
4 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-08-21 Edward Hervey <edward@fluendo.com>
* configure.ac:
If pygobject is available, only build with it, else try to find pygtk
to stay compatible with older version.
* gst/Makefile.am:
Switch to pygobject CFLAGS.
* testsuite/Makefile.am:
Switch to pygobject CFLAGS.
2006-08-08 Edward Hervey <edward@fluendo.com> 2006-08-08 Edward Hervey <edward@fluendo.com>
* codegen/codegen.py: * codegen/codegen.py:

29
configure.ac
View file

@ -35,6 +35,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")
dnl required versions of other packages dnl required versions of other packages
AC_SUBST(PYGTK_REQ, 2.6.3) AC_SUBST(PYGTK_REQ, 2.6.3)
AC_SUBST(PYGOBJECT_REQ, 2.11.2)
AC_SUBST(GLIB_REQ, 2.8.0) AC_SUBST(GLIB_REQ, 2.8.0)
AC_SUBST(GTK_REQ, 2.6.0) AC_SUBST(GTK_REQ, 2.6.0)
AC_SUBST(GST_REQ, 0.10.2) AC_SUBST(GST_REQ, 0.10.2)
@ -205,25 +206,17 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS)
AC_SUBST(GST_PLUGINS_BASE_CFLAGS) AC_SUBST(GST_PLUGINS_BASE_CFLAGS)
dnl check for pygtk dnl check for pygobject
PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ) PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= $PYGOBJECT_REQ,
AC_SUBST(PYGTK_CFLAGS) HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
AC_MSG_CHECKING(for pygtk defs) if test "x$HAVE_PYGOBJECT" = "xno"; then
PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` dnl If we don't have pygobject, then check for pygtk
AC_SUBST(PYGTK_DEFSDIR) dnl check for pygtk
AC_MSG_RESULT($PYGTK_DEFSDIR) PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ)
PYGOBJET_CFLAGS="\$(PYGTK_CFLAGS)"
AC_MSG_CHECKING(for pygtk h2def) fi
PYGTK_H2DEF=`$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py AC_SUBST(PYGOBJECT_CFLAGS)
AC_SUBST(PYGTK_H2DEF)
AC_MSG_RESULT($PYGTK_H2DEF)
AC_MSG_CHECKING(for pygtk codegen)
PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
dnl PYGTK_CODEGEN="$PYTHON \$(top_srcdir)/codegen/codegen.py"
AC_SUBST(PYGTK_CODEGEN)
AC_MSG_RESULT($PYGTK_CODEGEN)
dnl define an ERROR_CFLAGS Makefile variable dnl define an ERROR_CFLAGS Makefile variable
GST_SET_ERROR_CFLAGS($GST_CVS) GST_SET_ERROR_CFLAGS($GST_CVS)

3
gst/Makefile.am
View file

@ -1,4 +1,4 @@
common_cflags = $(PYGTK_CFLAGS) $(GST_CFLAGS) $(GST_OPTION_CFLAGS) -fno-strict-aliasing common_cflags = $(PYGOBJECT_CFLAGS) $(GST_CFLAGS) $(GST_OPTION_CFLAGS) -fno-strict-aliasing
common_libadd = $(GST_LIBS) $(GST_OPTION_LIBS) common_libadd = $(GST_LIBS) $(GST_OPTION_LIBS)
common_ldflags = -module -avoid-version common_ldflags = -module -avoid-version
@ -32,7 +32,6 @@ versioned_overrides = \
INCLUDES = $(PYTHON_INCLUDES) INCLUDES = $(PYTHON_INCLUDES)
EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py
PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
GEN_FILES = arg-types.py gst-types.defs libs.defs base.defs GEN_FILES = arg-types.py gst-types.defs libs.defs base.defs
# GStreamer bindings # GStreamer bindings

3
testsuite/Makefile.am
View file

@ -1,6 +1,6 @@
INCLUDES = \ INCLUDES = \
$(PYTHON_INCLUDES) \ $(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \ $(PYGOBJET_CFLAGS) \
$(PYGST_CFLAGS) \ $(PYGST_CFLAGS) \
$(GST_CFLAGS) $(GST_CFLAGS)
@ -9,6 +9,7 @@ linked_LIBS = testhelper.la
testhelper_la_LDFLAGS = -module -avoid-version testhelper_la_LDFLAGS = -module -avoid-version
testhelper_la_LIBADD = $(GLIB_LIBS) testhelper_la_LIBADD = $(GLIB_LIBS)
testhelper_la_CFLAGS = $(PYGOBJECT_CFLAGS)
testhelper_la_SOURCES = \ testhelper_la_SOURCES = \
testhelpermodule.c \ testhelpermodule.c \
test-object.c test-object.c