Makefile.am (PLAYDIR): Disable for now

Original commit message from CVS:
* Makefile.am (PLAYDIR): Disable for now

* configure.ac: Build against 0.8
This commit is contained in:
Johan Dahlin 2004-03-12 10:12:08 +00:00
parent 88f7dd3c95
commit 3c72b1fef6
3 changed files with 9 additions and 4 deletions

View file

@ -1,5 +1,9 @@
2004-03-12 Johan Dahlin <johan@gnome.org> 2004-03-12 Johan Dahlin <johan@gnome.org>
* Makefile.am (PLAYDIR): Disable for now
* configure.ac: Build against 0.8
* gstinterfaces/Makefile.am: clean up a little bit * gstinterfaces/Makefile.am: clean up a little bit
* gstinterfaces/__init__.py (devloc): s/gstreamer/gst/ * gstinterfaces/__init__.py (devloc): s/gstreamer/gst/

View file

@ -5,7 +5,8 @@ SUBDIRS_DOCS =
endif endif
INTERFACESDIR = gstinterfaces INTERFACESDIR = gstinterfaces
PLAYDIR = gstplay #PLAYDIR = gstplay
PLAYDIR =
UNCONDDIRS = gst pkgconfig examples testsuite UNCONDDIRS = gst pkgconfig examples testsuite
SUBDIRS = \ SUBDIRS = \
@ -13,7 +14,7 @@ SUBDIRS = \
$(INTERFACESDIR) \ $(INTERFACESDIR) \
$(PLAYDIR) \ $(PLAYDIR) \
$(SUBDIRS_DOCS) $(SUBDIRS_DOCS)
DIST_SUBDIRS = $(UNCONDDIRS) docs gstinterfaces gstplay DIST_SUBDIRS = $(UNCONDDIRS) docs gstinterfaces $(PLAYDIR)
EXTRA_DIST = \ EXTRA_DIST = \
gst-python.spec.in gst-python.spec README-docs gst-python.spec.in gst-python.spec README-docs

View file

@ -25,7 +25,7 @@ dnl required versions of other packages
AC_SUBST(PYGTK_REQ, 2.0.0) AC_SUBST(PYGTK_REQ, 2.0.0)
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.5) AC_SUBST(GST_REQ, 0.7.6)
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
@ -50,7 +50,7 @@ fi
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
dnl check for GStreamer dnl check for GStreamer
GST_MAJORMINOR=0.7 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) HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)