X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=build-vlc;h=1e47799156e07f8767261e17772d64fa7c7e3eab;hb=04804702d97e0667fdf05ed3ceeae6759fe732d4;hp=0b2495fd3fc0a6183f28206a91fa21dfb750703c;hpb=bad2afb75e673e37259d5ad8ff9b5733a08fe034;p=vlc

diff --git a/build-vlc b/build-vlc
index 0b2495fd3f..1e47799156 100755
--- a/build-vlc
+++ b/build-vlc
@@ -3,7 +3,7 @@
 FEATURES="
 SKINS skins2
 PDA pda
-WXWINDOWS wxwindows
+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
@@ -47,7 +46,6 @@ DIRECTX directx
 WINGDI wingdi
 SVGALIB svgalib
 GGI ggi
-GLIDE glide
 AA aa
 CACA caca
 OSS oss
@@ -86,10 +84,14 @@ 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
@@ -108,7 +110,6 @@ WITHFRIBIDICONFIGPATH fribidi-config-path
 WITHQTE qte
 WITHDIRECTX directx
 WITHGGI ggi
-WITHGLIDE glide
 WITHCACACONFIGPATH caca-config-path
 WITHMAD mad
 WITHMADTREE mad-tree
@@ -134,15 +135,15 @@ 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" ] || [ "$1" == "WITHFFMPEGFAAC" ]
+      if [ "$1" = "WITHFFMPEGMP3LAME" ] || [ "$1" = "WITHFFMPEGFAAC" ]
       then
          echo -n "--with-$2 " >> .cmd
       else
@@ -176,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