* Update ffmpeg contrib

[vlc] / build-vlc

diff --git a/build-vlc b/build-vlc
index a27017d8775d5ba68aed124c29a05a4cc23adab7..10b4a08fc630093e11a5f5072bf3f00d512685c3 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 FEATURES="
-SKINS skins
-SKINS2 skins2
-WXWINDOWS wxwindows
+SKINS skins2
+PDA pda
+WXWIDGETS wxwidgets
 OPIE opie
 MACOSX macosx
 QNX qnx
@@ -14,7 +14,6 @@ GOOM goom
 SLP slp
 LIRC lirc
 JOYSTICK joystick
-CORBA corba
 LIVEDOTCOM livedotcom
 DVDREAD dvdread
 DVDNAV dvdnav
@@ -28,8 +27,13 @@ DVB dvb
 OGG ogg
 MKV mkv
 MOD mod
+CDIO libcdio
+VCDX vcdx
+CDDAX cddax
+CDDB libcddb
 X11 x11
 XVIDEO xvideo
+GLX glx
 FB fb
 MGA mga
 SDL sdl
@@ -80,10 +84,14 @@ RELEASE release
 SOUT sout
 WITHFFMPEGMP3LAME ffmpeg-mp3lame
 WITHFFMPEGFAAC ffmpeg-faac
+GALAKTOS galaktos
+HTTPD httpd
+JACK jack
 "
 PATHS="
 WITHXML2CONFIGPATH xml2-config-path
 WITHWXCONFIGPATH wx-config-path
+WITHWXCONFIG wx-config
 WITHQTE qte
 WITHGOOMTREE goom-tree
 WITHSLP slp
@@ -136,25 +144,17 @@ do
    eval x="\$CONFIG_$1"
    if [ "$x" == "y" ]
    then
-      if [ "$1" == "WITHFFMPEGMP3LAME" ]
-      then 
-         echo -n "--with-$2 " >> .cmd
-      else if [ "$1" == "WITHFFMPEGFAAC" ]
+      if [ "$1" == "WITHFFMPEGMP3LAME" ] || [ "$1" == "WITHFFMPEGFAAC" ]
       then
          echo -n "--with-$2 " >> .cmd
       else
          echo -n "--enable-$2 " >> .cmd
-      fi fi
+      fi
    else
-      if [ "$1" == "WITHFFMPEGMP3LAME" ]
-      then 
-         echo -n "--without-$2 " >> .cmd
-      else if [ "$1" == "WITHFFMPEGFAAC" ]
+      if [ "$1" != "WITHFFMPEGMP3LAME" ] && [ "$1" != "WITHFFMPEGFAAC" ]
       then
-         echo -n "--without-$2 " >> .cmd
-      else
          echo -n "--disable-$2 " >> .cmd
-      fi fi
+      fi
    fi
    shift; shift
 done
@@ -178,6 +178,9 @@ done
 check_features $FEATURES
 check_paths $PATHS
 
+#XXX
+echo "--enable-maintainer-mode " >> .cmd
+
 if [ ! -e configure ]
 then
    ./bootstrap