X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=build-vlc;h=1e47799156e07f8767261e17772d64fa7c7e3eab;hb=a5c83dda798f93cc7a76bbb50d89352117e6ec46;hp=a27017d8775d5ba68aed124c29a05a4cc23adab7;hpb=69bbdda9de56ad1c2470dfa5d7cfee2ddc0b6491;p=vlc

diff --git a/build-vlc b/build-vlc
index a27017d877..1e47799156 100755
--- 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
@@ -42,7 +46,6 @@ DIRECTX directx
 WINGDI wingdi
 SVGALIB svgalib
 GGI ggi
-GLIDE glide
 AA aa
 CACA caca
 OSS oss
@@ -80,10 +83,15 @@ RELEASE release
 SOUT sout
 WITHFFMPEGMP3LAME ffmpeg-mp3lame
 WITHFFMPEGFAAC ffmpeg-faac
+GALAKTOS galaktos
+HTTPD httpd
+JACK jack
+QT4 qt4
 "
 PATHS="
 WITHXML2CONFIGPATH xml2-config-path
 WITHWXCONFIGPATH wx-config-path
+WITHWXCONFIG wx-config
 WITHQTE qte
 WITHGOOMTREE goom-tree
 WITHSLP slp
@@ -102,7 +110,6 @@ WITHFRIBIDICONFIGPATH fribidi-config-path
 WITHQTE qte
 WITHDIRECTX directx
 WITHGGI ggi
-WITHGLIDE glide
 WITHCACACONFIGPATH caca-config-path
 WITHMAD mad
 WITHMADTREE mad-tree
@@ -128,33 +135,25 @@ then
 fi
 
 echo -n "./configure " > .cmd
-source .config
+. ./.config
 
 check_features () {
 while [ -n "$1" ]
 do
    eval x="\$CONFIG_$1"
-   if [ "$x" == "y" ]
+   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,11 +177,14 @@ done
 check_features $FEATURES
 check_paths $PATHS
 
+#XXX
+echo "--enable-maintainer-mode " >> .cmd
+
 if [ ! -e configure ]
 then
    ./bootstrap
 fi
 
-source .cmd
+. ./.cmd
 make
 rm -f .cmd