From 59a728748050723ce68b6f3c005202de6606314c Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Wed, 8 Jan 2003 16:41:27 +0000
Subject: [PATCH] merge back from release

Original commit message from CVS:
merge back from release
---
 configure.ac                    | 5 +++--
 gst-libs/ext/ffmpeg/Makefile.am | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 59d6d3025b..4ad07ad185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -529,12 +529,13 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
     AC_MSG_NOTICE(slurping FFmpeg CVS source)
     AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2002-12-14 12:00 GMT,
                     HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
-    AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1, 
-                       [defined if we use uninstalled ffmpeg])
   else
     AC_MSG_NOTICE(FFmpeg CVS code should be included already)
     HAVE_FFMPEG=yes
   fi
+  # we only bother with uninstalled (included) ffmpeg for now
+  AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
+                     [defined if we use uninstalled ffmpeg])
 ])
 
 dnl *** Gnome VFS ***
diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
index 1dd50de901..b2ace5f065 100644
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ b/gst-libs/ext/ffmpeg/Makefile.am
@@ -3,7 +3,13 @@ EXTRA_DIST = Tag
 # this doesn't trigger the distdir target in the ffmpeg checkout
 DIST_SUBDIRS =
 
-SUBDIRS = ffmpeg
+if USE_FFMPEG
+FFMPEG_DIR=ffmpeg
+else
+FFMPEG_DIR=
+endif
+
+SUBDIRS = $(FFMPEG_DIR)
 
 DISTFILES = \
 	ffmpeg/Changelog \
@@ -16,6 +22,7 @@ DISTFILES = \
 	ffmpeg/configure \
 	ffmpeg/Makefile \
 	ffmpeg/cygwin_inttypes.h \
+	ffmpeg/ffserver.h \
 	ffmpeg/ffmpeg.c \
 	ffmpeg/ffserver.c \
 	ffmpeg/berrno.h \