configure.ac: actually properly define HAVE_FFMPEG_UNINSTALLED also use it as a conditional

Original commit message from CVS:
* configure.ac:
actually properly define HAVE_FFMPEG_UNINSTALLED
also use it as a conditional
* ext/ffmpeg/Makefile.am:
add a dep on the internal lib so the plugin gets rebuilt on
code changes to the ffmpeg lib

ChangeLog

@@ -1,3 +1,12 @@
+2007-01-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  actually properly define HAVE_FFMPEG_UNINSTALLED
+	  also use it as a conditional
+	* ext/ffmpeg/Makefile.am:
+	  add a dep on the internal lib so the plugin gets rebuilt on
+	  code changes to the ffmpeg lib
+
 2007-01-03  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_class_init),

common

@@ -1 +1 @@
-Subproject commit ee0bb43e2b66781d04078e2210404da48f6c68f0
+Subproject commit 64f924f6f2ff6275b06facb4c2adbc7c05f70641

configure.ac

@@ -171,8 +171,7 @@ AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
 
 dnl *** configure external libs ***
 
-AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
+HAVE_FFMPEG_UNINSTALLED=1
-                   [Defined if building against uninstalled FFmpeg source])
 
 AC_ARG_WITH(system-ffmpeg,
             [AC_HELP_STRING([--with-system-ffmpeg], [use system FFmpeg libraries])])
@@ -185,6 +184,8 @@ if test "x$with_system_ffmpeg" = "xyes"; then
   AC_CHECK_HEADERS([avi.h])
   CPPFLAGS="$saved_CPPFLAGS"
   AC_DEFINE([FFMPEG_SOURCE], ["system install"], [Describes where the FFmpeg libraries come from.])
+  HAVE_FFMPEG_UNINSTALLED=0
+  AC_MSG_NOTICE([Using system-installed FFMpeg code])
 else
   FFMPEG_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
                  -I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \
@@ -200,11 +201,16 @@ else
   AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.])
   ac_configure_args="$ac_configure_args --disable-v4l --disable-audio-oss --disable-dv1394 --disable-vhook --disable-ffmpeg --disable-ffserver --disable-ffplay --disable-sdltest --enable-pp"
   AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg)
+  AC_MSG_NOTICE([Using included FFMpeg code])
 fi
 AC_SUBST(FFMPEG_CFLAGS)
 AC_SUBST(FFMPEG_LIBS)
 AC_SUBST(FFMPEG_SUBDIRS)
 
+AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, $HAVE_FFMPEG_UNINSTALLED,
+                   [Defined if building against uninstalled FFmpeg source])
+AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1)
+
 AC_CONFIG_FILES(
 Makefile
 gst-ffmpeg.spec

ext/ffmpeg/Makefile.am

@@ -16,6 +16,11 @@ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS)
 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
+if HAVE_FFMPEG_UNINSTALLED
+libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS)
+endif
+
+
 noinst_HEADERS = \
 	gstffmpeg.h \
 	gstffmpegcodecmap.h \