3 files changed, 63 insertions, 800 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index de373c5e8e66..15d1937b97ca 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports-stable/multimedia/vlc-devel/Makefile,v 1.2 2005/08/15 05:48:27 mezz Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.2 2005/11/29 17:44:29 ahze Exp $
 #
 # NOTES about VLC Knobs:
 # Below you will see a number of knobs, if it starts with WITHOUT_ it is
@@ -69,6 +69,9 @@
 # WITH_REALAUDIO
 #  Real audio(R) support
 #
+# WITH_SHOUT
+#  Libshout2 support
+#
 # WITH_TREMOR
 #  Interger-only Ogg Vorbis decoder
 #   !!experimental!!
@@ -82,9 +85,6 @@
 # WITH_SPEEX=yes
 #  Speex voice codec Support
 #
-# WITH_TOOLAME=yes
-#  Toolame Support
-#
 # WITH_TWOLAME=yes
 #  Twolame Mpeg layer 2 audio Support
 #
@@ -96,13 +96,16 @@
 # WITH_AALIB=yes
 #  Console Graphics Support
 #
+# WITH_CACA=yes
+#  Console Graphics Support (implies WITH_AALIB)
+#
+# WITH_DV=yes
+#  Digital video input
+#
 # WITH_FRIBIDI=yes
 #
 # WITH_GGI=yes
 #
-# WITH_CACA=yes
-#  Console Graphics Support (implies WITH_AALIB)
-#
 # WITH_SDL=yes
 #  SDL video output
 #
@@ -153,7 +156,10 @@
 #
 # Other Knobs:
 #
-# DEBUG=yes
+# WITH_AVAHI=yes
+#  Avahi (Rendezvous/Bonjour (R) ) networking
+#
+# WITH_DEBUG=yes
 #  Enable debuging support
 #
 # WITHOUT_CDROM=yes
@@ -172,13 +178,15 @@
 # WITH_DVDREAD=yes
 #  Enable Regular DVD support (non-menu)
 #
-# WITH_MOZILLA=	[mozilla|mozilla-devel|firefox]
-# WITH_MOZILLA_PLUGIN= yes
+# WITH_GECKO= [firefox|mozilla|seamonkey|nvu]
+# WITH_VLC_MOZILLA_PLUGIN= yes
 #  Enable A mozilla plugin for VLC
 #  See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837
 #  for more info on using this plugin.
 #   defaults to www/mozilla
 #
+#  NOTE: The www/mplayer-plugin is much more complete.
+#
 # WITH_OPENGL=yes
 #  Enable OpenGL visual plugin (not playback, play back is default with X11)
 #
@@ -220,10 +228,11 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.4.20051102
+DISTVERSION=	0.8.5.20051128
 PORTREVISION=	0
 CATEGORIES=	multimedia audio ipv6 net www
-MASTER_SITES=	http://download.videolan.org/pub/vlc/snapshots/
+MASTER_SITES=	http://download2.videolan.org/pub/vlc/snapshots/ \
+		http://download.videolan.org/pub/vlc/snapshots/
 #		http://download2.videolan.org/pub/videolan/testing/${PORTNAME}-${DISTVERSION}/ \
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 #		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -231,21 +240,17 @@ MASTER_SITES=	http://download.videolan.org/pub/vlc/snapshots/
 #		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
 MASTER_SITE_SUBDIR=	ahze/:mozilla
 PKGNAMESUFFIX?=	-devel${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.4.//}
+DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.5.//}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
 
-RUN_DEPEDNS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
-CONFLICTS=	vlc-*-0.8.2*
+CONFLICTS=	vlc-*-0.8.4*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-snapshot-${PORTVERSION:S/0.8.4.//}
-### BROKEN -- Needs newer verision of toolame ###
-WITHOUT_TOOLAME=	yes
-WITHOUT_MOZILLA_PLUGIN=	yes
-### BROKEN ###
+WRKSRC=		${WRKDIR}/${PORTNAME}-snapshot-${PORTVERSION:S/0.8.5.//}
 
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 
@@ -266,7 +271,7 @@ PLIST=		${WRKDIR}/plist
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include/vlc/ ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
 CONFIGURE_ARGS+=	--enable-ffmpeg \
@@ -279,33 +284,6 @@ CONFIGURE_ARGS+=	--enable-ffmpeg \
 MAN1=		vlc.1 \
 		vlc-config.1
 
-.if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-### Remove comment when gnome 2.12 hits the streets.
-#WITH_MOZILLA?=	firefox
-.if ${WITH_MOZILLA}=="firefox"
-BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${X11BASE}/bin/firefox-config" \
-		XPIDL="${X11BASE}/lib/firefox/xpidl"\
-		XPIDL_INCL="-I${X11BASE}/share/idl/firefox"
-.else
-BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${X11BASE}/lib/mozilla${HEADERS_SUFX}/mozilla-config" \
-		XPIDL="${X11BASE}/lib/mozilla${HEADERS_SUFX}/xpidl" \
-		XPIDL_INCL="-I${X11BASE}/share/idl/mozilla${HEADERS_SUFX}"
-.endif
-MOZILLA_SUFFIX=-mozilla
-CONFIGURE_ARGS+=--enable-mozilla
-.if ${WITH_MOZILLA}=="mozilla-devel"
-HEADERS_SUFX=	-devel
-.else
-HEADERS_SUFX=
-.endif
-.endif
-
 .if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
 WX_CONFIG=	wxgtk2-2.4-config
 WXGTK2_PORT=	wxgtk24
@@ -321,16 +299,10 @@ CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
 BROKEN=	"Does not compile with perl ${PERL_VERSION}"
 .endif
 
-.if ${ARCH}=="amd64"
-WITH_WXGTK_VER=	2.4
-.endif
-
-.if ${OSVERSION} < 500000 && defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-.if ${WITH_MOZILLA}=="mozilla-devel"
-USE_GCC=	3.4
-WITHOUT_LIVEMEDIA=	yes
-.endif
-.endif
+#.if ${ARCH}=="amd64"
+# Maybe this works now??
+#WITH_WXGTK_VER=	2.4
+#.endif
 
 # compatible knobs.
 .if defined(WITH_DEBUG)
@@ -424,6 +396,13 @@ CONFIGURE_ARGS+=	--enable-arts
 CONFIGURE_ARGS+=	--disable-arts
 .endif
 
+.if (defined(WITH_AVAHI) || exists(${LOCALBASE}/lib/libavahi-client.a)) && !defi
+LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi
+CONFIGURE_ARGS+=	--enable-bonjour
+.else
+CONFIGUE_ARGS+=		--disable-bonjour
+.endif
+
 .if !defined(WITHOUT_CDROM)
 LIB_DEPENDS+=	vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
 		cdio.6:${PORTSDIR}/sysutils/libcdio
@@ -558,6 +537,13 @@ CONFIGURE_ARGS+=--enable-dts
 CONFIGURE_ARGS+=--disable-dts
 .endif
 
+.if (defined(WITH_DV) || exists(${LOCALBASE}/lib/libdv.a)) && !defined(WITHOUT_DV)
+LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+CONFIGURE_ARGS+=--enable-dv
+.else
+CONFIGURE_ARGS+=--disable-dv
+.endif
+
 .if defined(WITHOUT_HTTPD)
 CONFIGURE_ARGS+=--disable-httpd
 .endif
@@ -592,6 +578,16 @@ CONFIGURE_ARGS+=--enable-a52
 CONFIGURE_ARGS+=--disable-a52
 .endif
 
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
+USE_GECKO=	firefox mozilla seamonkey nvu
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+CONFIGURE_ENV+=	MOZILLA_CONFIG="${GECKO_CONFIG}" \
+		XPIDL="${XPIDL}" \
+		XPIDL_INCL="${XPIDL_INCL}"
+MOZILLA_SUFFIX=-mozilla
+CONFIGURE_ARGS+=--enable-mozilla
+.endif
+
 .if !defined(WITHOUT_MPEG2)
 LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
 CONFIGURE_ARGS+=--enable-libmpeg2
@@ -603,6 +599,11 @@ CONFIGURE_ARGS+=--disable-libmpeg2
 CONFIGURE_ARGS+=	--enable-real
 .endif
 
+.if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
+LIB_DEPENDS+=	shout.4:${PORTSDIR}/audio/libshout2
+CONFIGURE_AGRS+=	--enable-shout
+.endif
+
 .if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA)
 LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=--enable-theora
@@ -709,14 +710,6 @@ LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
 CONFIGURE_ARGS+=--disable-tremor
 .endif
 
-.if defined(WITH_TOOLAME) && !defined(WITHOUT_TOOLAME)
-BUILD_DEPENDS+=		toolame:${PORTSDIR}/audio/toolame
-RUN_DEPEDNS+=		toolame:${PORTSDIR}/audio/toolame
-CONFIGURE_ARGS+=	--enable-toolame
-.else
-CONFIGURE_ARGS+=	--disable-toolame
-.endif
-
 .if (defined(WITH_TWOLAME) || exists(${LOCALBASE}/lib/libtwolame.a)) && !defined(WITHOUT_TWOLAME)
 LIB_DEPENDS+=		twolame.0:${PORTSDIR}/audio/twolame
 CONFIGURE_ARGS+=	--enable-twolame
@@ -854,16 +847,6 @@ pre-install:
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
 .endfor
 
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^ffmpeg-0.4.9.p'`" ]; then \
-		${ECHO_MSG} ;\
-		${ECHO_MSG} "Note: ffmpeg-0.4.9 detected, if you want ffmpeg's postprocess" ;\
-		${ECHO_MSG} " features please hit ^C and remove ffmpeg-0.4.9 and" ;\
-		${ECHO_MSG} " install multimedia/ffmpeg-devel" ;\
-		${ECHO_MSG} ;\
-		sleep 2 ;\
-	fi
-
 do-install:
 	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
 		${FAKEDIR}/bin/vlc-config
@@ -891,7 +874,7 @@ do-install:
 	fi
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/gvlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
+	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
 .endif
 .if !defined(WITHOUT_WXGTK)
 	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 3a644f1d291c..194699a2ffd7 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-snapshot-20051102.tar.gz) = f5800e5a53a2100eadc2dc425ff340bd
-SHA256 (vlc-snapshot-20051102.tar.gz) = 169dc609454c701c1bfc5fdcd058829bf873b5686b3f6eb098e490edc6b76696
-SIZE (vlc-snapshot-20051102.tar.gz) = 9324895
+MD5 (vlc-snapshot-20051128.tar.gz) = 684b60f212024ca1d9a0b0b2997bad41
+SHA256 (vlc-snapshot-20051128.tar.gz) = be94189011097265d0b98ba690dec50d5eb15e3c59a83d2fa36f78e3a881113b
+SIZE (vlc-snapshot-20051128.tar.gz) = 10598222
diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure
deleted file mode 100644
index 15573ec1bab6..000000000000
--- a/multimedia/vlc-devel/files/patch-configure
+++ /dev/null
@@ -1,720 +0,0 @@
---- configure		2005-10-28 17:50:35.000000000 +0200
-+++ configure.good	2005-10-28 14:30:39.000000000 +0200
-@@ -25435,7 +25435,716 @@
- 	fi
- fi;
- 
--   :
-+
-+                if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}"; then
-+      CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
-+      LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
-+
-+for ac_header in ffmpeg/avcodec.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------ ##
-+## Report this to the vlc lists.  ##
-+## ------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  { { echo "$as_me:$LINENO: error: Missing header file ffmpeg/avcodec.h." >&5
-+echo "$as_me: error: Missing header file ffmpeg/avcodec.h." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+done
-+
-+
-+for ac_header in postproc/postprocess.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------ ##
-+## Report this to the vlc lists.  ##
-+## ------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  { { echo "$as_me:$LINENO: error: Missing header file postproc/postprocess.h." >&5
-+echo "$as_me: error: Missing header file postproc/postprocess.h." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+done
-+
-+
-+      echo "$as_me:$LINENO: checking for av_add_i in -lavutil" >&5
-+echo $ECHO_N "checking for av_add_i in -lavutil... $ECHO_C" >&6
-+if test "${ac_cv_lib_avutil_av_add_i+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char av_add_i ();
-+int
-+main ()
-+{
-+av_add_i ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_avutil_av_add_i=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_avutil_av_add_i=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_avutil_av_add_i" >&5
-+echo "${ECHO_T}$ac_cv_lib_avutil_av_add_i" >&6
-+if test $ac_cv_lib_avutil_av_add_i = yes; then
-+
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lavutil "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+        LDAVUTIL="-lavutil"
-+fi
-+
-+
-+      echo "$as_me:$LINENO: checking for avcodec_init in -lavcodec" >&5
-+echo $ECHO_N "checking for avcodec_init in -lavcodec... $ECHO_C" >&6
-+if test "${ac_cv_lib_avcodec_avcodec_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavcodec $LDAVUTIL $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char avcodec_init ();
-+int
-+main ()
-+{
-+avcodec_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_avcodec_avcodec_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_avcodec_avcodec_init=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_avcodec_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_init" >&6
-+if test $ac_cv_lib_avcodec_avcodec_init = yes; then
-+
-+
-+  BUILTINS="${BUILTINS} ffmpeg"
-+
-+
-+
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lavcodec "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+        if test "${enable_sout}" != "no"; then
-+
-+  BUILTINS="${BUILTINS} stream_out_switcher"
-+
-+        fi
-+else
-+   { { echo "$as_me:$LINENO: error: Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins." >&5
-+echo "$as_me: error: Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+      echo "$as_me:$LINENO: checking for av_open_input_stream in -lavformat" >&5
-+echo $ECHO_N "checking for av_open_input_stream in -lavformat... $ECHO_C" >&6
-+if test "${ac_cv_lib_avformat_av_open_input_stream+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavformat -lavcodec -lz $LDAVUTIL $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char av_open_input_stream ();
-+int
-+main ()
-+{
-+av_open_input_stream ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_avformat_av_open_input_stream=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_avformat_av_open_input_stream=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_open_input_stream" >&5
-+echo "${ECHO_T}$ac_cv_lib_avformat_av_open_input_stream" >&6
-+if test $ac_cv_lib_avformat_av_open_input_stream = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBAVFORMAT 1
-+_ACEOF
-+
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lavformat -lz "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+fi
-+
-+      LDFLAGS="${LDFLAGS_save}"
-+      CPPFLAGS="${CPPFLAGS_save}"
-+    fi
-+
-+                if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then
-+      echo "$as_me:$LINENO: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
-+echo $ECHO_N "checking for libavcodec.a in ${with_ffmpeg_tree}... $ECHO_C" >&6
-+      real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
-+      if test -z "${real_ffmpeg_tree}"; then
-+                echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+        { { echo "$as_me:$LINENO: error: cannot cd to ${with_ffmpeg_tree}" >&5
-+echo "$as_me: error: cannot cd to ${with_ffmpeg_tree}" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+      if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
-+                echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+        { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
-+echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+      if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
-+                echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+        { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
-+echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+            echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5
-+echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6
-+
-+      if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
-+        if test "${with_ffmpeg_zlib}" != "yes"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lz "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+        fi
-+      fi
-+      if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then
-+        if test "${with_ffmpeg_mp3lame}" != "yes"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lmp3lame "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+        fi
-+      fi
-+      if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then
-+        if test "${with_ffmpeg_faac}" != "yes"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lfaac "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+        fi
-+      fi
-+      if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then
-+        if test "${with_ffmpeg_dts}" != "yes"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-ldts "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+        fi
-+      fi
-+      if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lvorbis -lvorbisenc "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+      fi
-+      if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lfaad "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+      fi
-+      if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-lxvidcore "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+      fi
-+
-+
-+  BUILTINS="${BUILTINS} ffmpeg"
-+
-+      if test "${enable_sout}" != "no"; then
-+
-+  BUILTINS="${BUILTINS} stream_out_switcher"
-+
-+      fi
-+
-+      if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+
-+  for element in ffmpeg stream_out_switcher; do
-+    eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} -I${real_ffmpeg_tree}/libavutil"'"'
-+    am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
-+  done
-+
-+      fi
-+
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+
-+  for element in ffmpeg stream_out_switcher; do
-+    eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} -I${real_ffmpeg_tree}/libavcodec"'"'
-+    am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
-+  done
-+
-+
-+      if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBAVFORMAT 1
-+_ACEOF
-+
-+
-+  for element in ffmpeg; do
-+    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a "'$'"{LDFLAGS_${element}} "'"'
-+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-+  done
-+
-+
-+  for element in ffmpeg stream_out_switcher; do
-+    eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} -I${real_ffmpeg_tree}/libavformat"'"'
-+    am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
-+  done
-+
-+      fi
-+    fi
- 
- # Check whether --with-ffmpeg-tree or --without-ffmpeg-tree was given.
- if test "${with_ffmpeg_tree+set}" = set; then