configure.ac: Support build without gstplay and gstinterfaces

Original commit message from CVS:
* configure.ac: Support build without gstplay and gstinterfaces
This commit is contained in:
Johan Dahlin 2004-03-16 18:57:10 +00:00
parent 31d29bd63a
commit 444ae8dc6d
3 changed files with 18 additions and 29 deletions

View file

@ -1,5 +1,7 @@
2004-03-16 Johan Dahlin <johan@gnome.org> 2004-03-16 Johan Dahlin <johan@gnome.org>
* configure.ac: Support build without gstplay and gstinterfaces
* gst/Makefile.am: Move the gstplay bindings over here * gst/Makefile.am: Move the gstplay bindings over here
* Makefile.am, configure.ac: Remove examples/ and put them in * Makefile.am, configure.ac: Remove examples/ and put them in

View file

@ -4,9 +4,9 @@ AC_PREREQ(2.57)
AC_INIT AC_INIT
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
m4_define(pygst_major_version, 2) m4_define(pygst_major_version, 0)
m4_define(pygst_minor_version, 1) m4_define(pygst_minor_version, 7)
m4_define(pygst_micro_version, 0) m4_define(pygst_micro_version, 90)
m4_define(pygst_version, pygst_major_version.pygst_minor_version.pygst_micro_version) m4_define(pygst_version, pygst_major_version.pygst_minor_version.pygst_micro_version)
AM_INIT_AUTOMAKE(gst-python, pygst_version) AM_INIT_AUTOMAKE(gst-python, pygst_version)
@ -22,10 +22,10 @@ dnl Add parameters for aclocal
ACLOCAL="$ACLOCAL -I common/m4 $ACLOCAL_FLAGS" ACLOCAL="$ACLOCAL -I common/m4 $ACLOCAL_FLAGS"
dnl required versions of other packages dnl required versions of other packages
AC_SUBST(PYGTK_REQ, 1.99.4) AC_SUBST(PYGTK_REQ, 1.99.4)
AC_SUBST(GLIB_REQ, 2.0.0) AC_SUBST(GLIB_REQ, 2.0.0)
AC_SUBST(GTK_REQ, 2.0.0) AC_SUBST(GTK_REQ, 2.0.0)
AC_SUBST(GST_REQ, 0.7.6) AC_SUBST(GST_REQ, 0.8.0)
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
@ -51,17 +51,10 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
dnl check for GStreamer dnl check for GStreamer
GST_MAJORMINOR=0.8 GST_MAJORMINOR=0.8
PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ)
HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)
dnl Give error and exit if we don't have GStreamer
if test "x$HAVE_GSTREAMER" = "xno"; then
AC_MSG_ERROR(you need GStreamer development packages installed !)
fi
AC_SUBST(GST_MAJORMINOR)
dnl check for pygtk dnl check for pygtk
PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ) PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ)
AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_CFLAGS)
@ -83,19 +76,17 @@ dnl AC_MSG_RESULT($PYGTK_CODEGEN)
PYGTK_CODEGEN="$PYTHON \$(top_srcdir)/codegen/codegen.py" PYGTK_CODEGEN="$PYTHON \$(top_srcdir)/codegen/codegen.py"
AC_SUBST(PYGTK_CODEGEN) AC_SUBST(PYGTK_CODEGEN)
#dnl check for glib
#AM_PATH_GLIB_2_0(glib_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods)
#
#dnl check to make sure we can find gtk
#AM_PATH_GTK_2_0(gtk_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods)
AC_MSG_CHECKING(for GStreamer interfaces include dir) AC_MSG_CHECKING(for GStreamer interfaces include dir)
PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-interfaces-$GST_MAJORMINOR) PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-interfaces-$GST_MAJORMINOR,
HAVE_INTERFACES=yes,HAVE_INTERFACES=no)
AM_CONDITIONAL(BUILD_INTERFACES, test "x$HAVE_INTERFACES" = "xyes")
AC_SUBST(GST_INTERFACES_CFLAGS) AC_SUBST(GST_INTERFACES_CFLAGS)
AC_SUBST(GST_INTERFACES_INCLUDES) AC_SUBST(GST_INTERFACES_INCLUDES)
AC_MSG_CHECKING(for GStreamer play include dir) AC_MSG_CHECKING(for GStreamer play include dir)
PKG_CHECK_MODULES(GST_PLAY, gstreamer-play-$GST_MAJORMINOR) PKG_CHECK_MODULES(GST_PLAY, gstreamer-play-$GST_MAJORMINOR,
HAVE_PLAY=yes,HAVE_PLAY=no)
AM_CONDITIONAL(BUILD_PLAY, test "x$HAVE_PLAY" = "xyes")
AC_SUBST(GST_PLAY_CFLAGS) AC_SUBST(GST_PLAY_CFLAGS)
AC_SUBST(GST_PLAY_INCLUDES) AC_SUBST(GST_PLAY_INCLUDES)

View file

@ -32,14 +32,12 @@ defs_DATA += $(GST_DEFS)
gst.c: $(GST_DEFS) $(GST_OVERRIDES) gst.c: $(GST_DEFS) $(GST_OVERRIDES)
# gst-play bindings # gst-play bindings
# FIXEME: configure.ac
PLAY_OVERRIDES = play.override PLAY_OVERRIDES = play.override
PLAY_DEFS = play.defs PLAY_DEFS = play.defs
#if BUILD_PLAY if BUILD_PLAY
pygstexec_LTLIBRARIES += play.la pygstexec_LTLIBRARIES += play.la
#endif endif
play_la_CFLAGS = $(GST_CFLAGS) $(GST_PLAY_CFLAGS) -fno-strict-aliasing play_la_CFLAGS = $(GST_CFLAGS) $(GST_PLAY_CFLAGS) -fno-strict-aliasing
play_la_LIBADD = $(GST_LIBS) $(GST_PLAY_LIBS) play_la_LIBADD = $(GST_LIBS) $(GST_PLAY_LIBS)
play_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initplay play_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initplay
@ -51,14 +49,12 @@ defs_DATA += $(PLAY_DEFS)
play.c: $(PLAY_DEFS) $(PLAY_OVERRIDES) play.c: $(PLAY_DEFS) $(PLAY_OVERRIDES)
# GStreamer interfaces bindings # GStreamer interfaces bindings
INTERFACES_OVERRIDES = interfaces.override xoverlay.override INTERFACES_OVERRIDES = interfaces.override xoverlay.override
INTERFACES_DEFS = interfaces.defs xoverlay.defs xwindowlistener.defs INTERFACES_DEFS = interfaces.defs xoverlay.defs xwindowlistener.defs
# FIXEME: configure.ac if BUILD_INTERFACES
#if BUILD_INTERFACES
pygstexec_LTLIBRARIES += interfaces.la pygstexec_LTLIBRARIES += interfaces.la
#endif endif
interfaces_la_CFLAGS = $(GST_CFLAGS) $(GST_INTERFACES_CFLAGS) -fno-strict-aliasing interfaces_la_CFLAGS = $(GST_CFLAGS) $(GST_INTERFACES_CFLAGS) -fno-strict-aliasing
interfaces_la_LIBADD = $(GST_LIBS) $(GST_INTERFACES_LIBS) interfaces_la_LIBADD = $(GST_LIBS) $(GST_INTERFACES_LIBS)
interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface