alright ! ready to test.

Original commit message from CVS:
alright ! ready to test.
need to write up how to manage the source now though

diff --git a/ChangeLog b/ChangeLog
index 5225b72..d1fdc72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-11  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * configure.ac: use new setup with mirrored cvs tree
+
 2004-03-10  David Schleef  <ds@schleef.org>
 
        * gst-libs/ext/ffmpeg/patch/asm.diff:  Add a patch that

diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index b91d01c..883c664 100644 (file)
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -1,3 +1,13 @@
+# we have to put in a little hack here for integration to work well
+# ffmpeg can't be in SUBDIRS, because then automake will try to descend in it
+# and find conditionals it doesn't know.
+
+# so,
+# - don't put it in SUBDIRS so automake doesn't descend
+# - put it in DIST_SUBDIRS so make dist picks up the subtree
+# - add an all-local hook so it does get built
+# this also satisfies make distcheck
+
 SUBDIRS =
 DIST_SUBDIRS = ffmpeg