diff options
| author | Johan Dahlin <johan@gnome.org> | 2004-03-12 10:12:08 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2004-03-12 10:12:08 +0000 |
| commit | 3c72b1fef61f69a190d1a39c7723160ba82e9d79 (patch) | |
| tree | 6a518d049127375e894148dfba0c01021ab2af02 | |
| parent | 88f7dd3c95a202aa891248d3bf5f377c557f60ad (diff) | |
Makefile.am (PLAYDIR): Disable for now
Original commit message from CVS:
* Makefile.am (PLAYDIR): Disable for now
* configure.ac: Build against 0.8
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,5 +1,9 @@ 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/__init__.py (devloc): s/gstreamer/gst/ diff --git a/Makefile.am b/Makefile.am index 05d8fec899..c70cb6c0c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,8 @@ SUBDIRS_DOCS = endif INTERFACESDIR = gstinterfaces -PLAYDIR = gstplay +#PLAYDIR = gstplay +PLAYDIR = UNCONDDIRS = gst pkgconfig examples testsuite SUBDIRS = \ @@ -13,7 +14,7 @@ SUBDIRS = \ $(INTERFACESDIR) \ $(PLAYDIR) \ $(SUBDIRS_DOCS) -DIST_SUBDIRS = $(UNCONDDIRS) docs gstinterfaces gstplay +DIST_SUBDIRS = $(UNCONDDIRS) docs gstinterfaces $(PLAYDIR) EXTRA_DIST = \ gst-python.spec.in gst-python.spec README-docs diff --git a/configure.ac b/configure.ac index 1ebd24a2d0..48d0c3ce1b 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl required versions of other packages AC_SUBST(PYGTK_REQ, 2.0.0) AC_SUBST(GLIB_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_PROG_LIBTOOL @@ -50,7 +50,7 @@ fi AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) dnl check for GStreamer -GST_MAJORMINOR=0.7 +GST_MAJORMINOR=0.8 PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no) |