[vlc-commits] commit: Disable avformat if avcodec is disabled ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jul 21 23:54:41 2010 +0300| [4bbbe32fb69cd892a6d37bc03f4a8fbca1dda62e] | committer: Rémi Denis-Courmont 

Disable avformat if avcodec is disabled

(cherry picked from commit a81518d6c9f960b92fcafb24855398600c0765ee)

Conflicts:

	configure.ac

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4bbbe32fb69cd892a6d37bc03f4a8fbca1dda62e
---

 configure.ac |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b61f0c..82b8eb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2663,8 +2663,7 @@ dnl  avcodec decoder/encoder plugin
 dnl
 AC_ARG_ENABLE(avcodec,
 [  --enable-avcodec        libavcodec codec (default enabled)])
-if test "${enable_avcodec}" != "no"
-then
+AS_IF([test "${enable_avcodec}" != "no"], [
   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil],
     [
       VLC_SAVE_FLAGS
@@ -2680,7 +2679,9 @@ then
     ],[
       AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
   ])
-fi
+], [
+  have_avcodec="no"
+])
 
 dnl
 dnl libva needs avcodec
@@ -2772,7 +2773,9 @@ dnl  avformat demuxer/muxer plugin
 dnl
 
 AC_ARG_ENABLE(avformat,
-[  --enable-avformat       libavformat containers (default enabled)])
+[  --enable-avformat       libavformat containers (default enabled)],, [
+  enable_avformat="${have_avcodec}"
+])
 if test "${enable_avformat}" != "no"
 then
   PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil],