Added current changes in the menu.

I will now try to generate defconfig by bootstrap...

diff --git a/build-vlc b/build-vlc
index 57ca1186587448e93c713f8c7cc17cb28fb0523f..a27017d8775d5ba68aed124c29a05a4cc23adab7 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -1,73 +1,132 @@
 #!/bin/sh
 
 FEATURES="
-GNOME gnome
-GNOME2 gnome2
-GTK gtk
-GTK2 gtk2
 SKINS skins
-BASIC_SKINS basic-skins
-FAMILIAR familiar
+SKINS2 skins2
 WXWINDOWS wxwindows
-QT qt
-KDE kde
 OPIE opie
 MACOSX macosx
 QNX qnx
-INTFWIN intfwin
 NCURSES ncurses
 XOSD xosd
-DVDOLD dvd
+VISUAL visual
+GOOM goom
+SLP slp
+LIRC lirc
+JOYSTICK joystick
+CORBA corba
+LIVEDOTCOM livedotcom
 DVDREAD dvdread
-DVDPLAY dvdplay
+DVDNAV dvdnav
+DSHOW dshow
 DVBPSI dvbpsi
-VCD vcd
 V4L v4l
-SAT satellite
+PVR pvr
+VCD vcd
+SATELLITE satellite
+DVB dvb
+OGG ogg
+MKV mkv
+MOD mod
 X11 x11
 XVIDEO xvideo
-SDL sdl
 FB fb
-DIRECTX directx
-WINGDI wingdi
+MGA mga
+SDL sdl
 FREETYPE freetype
+FRIBIDI fribidi
+SVG svg
 QTE qte
-MGA mga
+HD1000V hd1000v
+DIRECTX directx
+WINGDI wingdi
 SVGALIB svgalib
 GGI ggi
 GLIDE glide
 AA aa
+CACA caca
 OSS oss
 ESD esd
 ARTS arts
 ALSA alsa
 WAVEOUT waveout
 COREAUDIO coreaudio
-OGG ogg
-A52 a52
+HD1000A hd1000a
 MAD mad
 FFMPEG ffmpeg
 FAAD faad
-XVID xvid
-DV dv
+QUICKTIME quicktime
+A52 a52
+DTS dts
 FLAC flac
 LIBMPEG2 libmpeg2
 VORBIS vorbis
 TREMOR tremor
+SPEEX speex
 TARKIN tarkin
 THEORA theora
-SOUT sout
-SLP slp
+CMML cmml
+UTF8 utf8
+PTH pth
+ST st
+GPROF gprof
+CPROF cprof
+MOZILLA mozilla
+TESTSUITE testsuite
+OPTIMIZATIONS optimizations
+ALTIVEC altivec
 DEBUG debug
+RELEASE release
+SOUT sout
+WITHFFMPEGMP3LAME ffmpeg-mp3lame
+WITHFFMPEGFAAC ffmpeg-faac
 "
 PATHS="
-FFMPEG_TREE ffmpeg-tree
+WITHXML2CONFIGPATH xml2-config-path
+WITHWXCONFIGPATH wx-config-path
+WITHQTE qte
+WITHGOOMTREE goom-tree
+WITHSLP slp
+WITHLIVEDOTCOMTREE livedotcom-tree
+WITHDVDREAD dvdread
+WITHDVDREADTREEE dvdread-tree
+WITHDVDNAVCONFIGPATH dvdnav-config-path
+WITHDVBPSI dvbpsi
+WITHDVBPSITREE dvbpsi-tree
+WITHV4L v4l
+WITHDVB dvb
+WITHSDLCONFIGPATH sdl-config-path
+WITHSDLPREFIX sdl-prefix
+WITHFREETYPECONFIGPATH freetype-config-path
+WITHFRIBIDICONFIGPATH fribidi-config-path
+WITHQTE qte
+WITHDIRECTX directx
+WITHGGI ggi
+WITHGLIDE glide
+WITHCACACONFIGPATH caca-config-path
+WITHMAD mad
+WITHMADTREE mad-tree
+WITHFFMPEGTREE ffmpeg-tree
+WITHFAADTREE faad-tree
+WITHA52 a52
+WITHA52TREE a52-tree
+WITHDTSTREE dts-tree
+WITHLIBMPEG2TREE libmpeg2-tree
+WITHTARKINTREE tarkin-tree
+WITHMOZILLASDKPATH mozilla-sdk-path
+ENDIANNESS words
 "
 if [ ! -e .config ]
 then
    ./menuconfig
 fi
 
+if [ -e .cmd ]
+then
+   echo ".cmd still exist. Removing it."
+   rm -f .cmd
+fi
+
 echo -n "./configure " > .cmd
 source .config
 
@@ -77,9 +136,25 @@ do
    eval x="\$CONFIG_$1"
    if [ "$x" == "y" ]
    then
-      echo -n "--enable-$2 " >> .cmd
+      if [ "$1" == "WITHFFMPEGMP3LAME" ]
+      then 
+         echo -n "--with-$2 " >> .cmd
+      else if [ "$1" == "WITHFFMPEGFAAC" ]
+      then
+         echo -n "--with-$2 " >> .cmd
+      else
+         echo -n "--enable-$2 " >> .cmd
+      fi fi
    else
-      echo -n "--disable-$2 " >> .cmd
+      if [ "$1" == "WITHFFMPEGMP3LAME" ]
+      then 
+         echo -n "--without-$2 " >> .cmd
+      else if [ "$1" == "WITHFFMPEGFAAC" ]
+      then
+         echo -n "--without-$2 " >> .cmd
+      else
+         echo -n "--disable-$2 " >> .cmd
+      fi fi
    fi
    shift; shift
 done
@@ -91,7 +166,10 @@ do
    if [ -n $1 ]
    then
       eval x="\$CONFIG_$1"
-      echo -n "--with-$2=$x" >> .cmd
+      if [ "$x" != "" ]
+      then
+         echo -n "--with-$2=$x " >> .cmd
+      fi
    fi
    shift; shift
 done

diff --git a/config.in b/config.in
index 60a5d92318513bc56f0e2d1e95457c555f828804..a048abf6eceee12c914061edb8f0817e7e4dcfdf 100644 (file)
--- a/config.in
+++ b/config.in
@@ -6,70 +6,137 @@ mainmenu_name "VLC Configuration"
 
 choice 'Operating System' \
    "Linux              CONFIG_LINUX \
-    MacOS_X            CONFIG_MAC \
+   MacOS_X             CONFIG_MAC \
     Win32              CONFIG_WIN32" Linux
 
 mainmenu_option next_comment
-comment 'Graphical User Interfaces'
-bool 'GTK+ support' CONFIG_GTK
-dep_bool '   Gnome interface support' CONFIG_GNOME $CONFIG_GTK
-bool 'GTK2 support' CONFIG_GTK2
-dep_bool '   Gnome2 support' CONFIG_GNOME2 $CONFIG_GTK2
+comment 'Interfaces'
 bool 'Skins module' CONFIG_SKINS
-bool 'Basic skins module (without wxWindows)' CONFIG_BASIC_SKINS
-bool 'Familiar GTK+ support' CONFIG_FAMILIAR
+bool 'Skins2 module' CONFIG_SKINS2
+if [ "$CONFIG_SKINS2" = "y" ]; then
+  string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
+fi
+# TODO: --enable-pda
 bool 'wxWindows support' CONFIG_WXWINDOWS
-bool 'Qt interface support' CONFIG_QT
-bool 'KDE interface support' CONFIG_KDE
+if [ "$CONFIG_WXWINDOWS" = "y" ]; then
+  string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
+fi
 bool 'Qt embedded interface support' CONFIG_OPIE
+if [ "$CONFIG_OPIE" = "y" ]; then
+  string 'Qt Embedded headers and libraries' CONFIG_WITHQTE ""
+fi
 if [ "$CONFIG_MAC" = "y" ]; then
    bool 'MacOS X support' CONFIG_MACOSX
 fi
 bool 'QNX RTOS support' CONFIG_QNX
-if [ "$CONFIG_WIN32" = "y" ]; then
-   bool 'Win32 interface support' CONFIG_INTFWIN
-fi
-bool 'ncurses interface support' CONFIG_NCURSES
+bool 'Ncurses interface support' CONFIG_NCURSES
 bool 'xosd interface support' CONFIG_XOSD
+bool 'Visualization plugin' CONFIG_VISUAL
+bool 'Goom visualization plugin' CONFIG_GOOM
+if [ "$CONFIG_GOOM" = "y" ]; then
+  string 'goom tree for static linking' CONFIG_WITHGOOMTREE ""
+fi
+bool 'SLP service discovery support' CONFIG_SLP
+if [ "$CONFIG_SLP" = "y" ]; then
+  string 'libslp headers and libraries' CONFIG_WITHSLP ""
+fi
+bool 'IR remote control support' CONFIG_LIRC
+bool 'Joystick control' CONFIG_JOYSTICK
+bool 'Corba interface support' CONFIG_CORBA
 endmenu
 
 mainmenu_option next_comment
-comment 'Inputs'
+comment 'Input plugins'
+bool 'Live.com input plugin' CONFIG_LIVEDOTCOM
+if [ "$CONFIG_LIVEDOTCOM" = "y" ]; then
+  string 'live.com tree for static linking' CONFIG_WITHLIVEDOTCOMTREE ""
+fi
 bool 'DVD support' CONFIG_DVD
 if [ "$CONFIG_DVD" = "y" ]; then
-   bool '    DVD input module' CONFIG_DVDOLD
    bool '    dvdread input module' CONFIG_DVDREAD
-   bool '    dvdplay input module' CONFIG_DVDPLAY
-   bool '    dvbpsi ts mux and demux module' CONFIG_DVBPSI
+   if [ "$CONFIG_DVDREAD" = "y" ]; then
+      string '        libdvdread headers and libraries' CONFIG_WITHDVDREAD ""
+      string '        libdvdread tree for static linking' CONFIG_WITHDVDREADTREE ""
+   fi
+   bool '    dvdnav input module' CONFIG_DVDNAV
+   if [ "$CONFIG_DVDNAV" = "y" ]; then
+      string '        dvdnav-config path' CONFIG_WITHDVDNAVCONFIGPATH ""
+   fi
+fi
+boof 'Win32 DirectShow support' CONFIG_DSHOW
+bool 'Dvbpsi ts mux and demux module' CONFIG_DVBPSI
+if [ "$CONFIG_DVBPSI" = "y" ]; then
+   string '    libdvbpsi headers and libraries' CONFIG_WITHDVBPSI ""
+   string '    libdvbpsi tree for static linking' CONFIG_WITHDVBPSITREE ""
 fi
-bool 'VCD support' CONFIG_VCD
 bool 'Video for Linux (V4L) support' CONFIG_V4L
-bool 'Satellite support' CONFIG_SAT
+if [ "$CONFIG_V4L" = "y" ]; then
+   string '    path to a v4l-enabled kernel tree' CONFIG_WITHV4L
+fi
+bool 'PVR cards support' CONFIG_PVR
+bool 'VCD support for Linux, FreeBSD, MacOS X and Win32' CONFIG_VCD
+bool 'Satellite card support' CONFIG_SATELLITE
+bool 'DVB-S/T/C cards support' CONFIG_DVB
+if [ "$CONFIG_DVB" = "y" ]; then
+   string '    path to a dvb- and v4l2-enabled kernel tree' CONFIG_WITHDVB
+fi
+bool 'Ogg demux support' CONFIG_OGG
+bool 'Matroska demux support' CONFIG_MKV
+bool 'Mod demux support' CONFIG_MOD
 endmenu
 
 mainmenu_option next_comment
-comment 'Video outputs'
+comment 'Video plugins'
 if [ "$CONFIG_LINUX" = "y" ]; then
    bool 'X11 support' CONFIG_X11
    bool 'XVideo support' CONFIG_XVIDEO
    bool 'Linux framebuffer support' CONFIG_FB
+   bool 'Linux kernel Matrox support' CONFIG_MGA
+fi
+bool 'SDL support' CONFIG_SDL
+if [ "$CONFIG_SDL" = "y" ]; then
+   string '    SDL-config path' CONFIG_WITHSDLCONFIGPATH ""
+   string '    Path to libsdl' CONFIG_WITHSDLPREFIX ""
+fi
+bool 'freetype support' CONFIG_FREETYPE
+if [ "$CONFIG_FREETYPE" = "y" ]; then
+   string '    Freetype-config path' CONFIG_WITHFREETYPECONFIGPATH ""
 fi
+bool 'Fribidi support' CONFIG_FRIBIDI
+if [ "$CONFIG_FRIBIDI" = "y" ]; then
+   string '    Fribidi-config path' CONFIG_WITHFRIBIDICONFIGPATH ""
+fi
+bool 'SVG support' CONFIG_SVG
+bool 'QT Embedded support' CONFIG_QTE
+if [ "$CONFIG_QTE" = "y" ]; then
+   string '    Qt Embedded headers and libraries' CONFIG_WITHQTE ""
+fi
+bool 'HD1000 Video Output module' CONFIG_HD1000V
 if [ "$CONFIG_WIN32" = "y" ]; then
    bool 'Win32 DirectX support' CONFIG_DIRECTX
+   if [ "$CONFIG_DIRECTX" = "y" ]; then
+      string '    Win32 DirectX headers' CONFIG_WITHDIRECTX ""
+   fi
    bool 'Win32 GDI module' CONFIG_WINGDI
 fi
-bool 'SDL video output' CONFIG_SDL
-bool 'freetype support' CONFIG_FREETYPE
-bool 'QT Embedded support' CONFIG_QTE
-bool 'Linux kernel Matrox support' CONFIG_MGA
 bool 'SVGAlib support' CONFIG_SVGALIB
 bool 'GGI support' CONFIG_GGI
+if [ "$CONFIG_GGI" = "y" ]; then
+   string '    Path to libggi' CONFIG_WITHGGI ""
+fi
 bool 'Glide (3dfx) support' CONFIG_GLIDE
+if [ "$CONFIG_GLIDE" = "y" ]; then
+   string '    Path to libglide' CONFIG_WITHGLIDE ""
+fi
 bool 'aalib output' CONFIG_AA
+bool 'cacalib output' CONFIG_CACA
+if [ "$CONFIG_CACA" = "y" ]; then
+   string '    Caca-config path' CONFIG_WITHCACACONFIGPATH ""
+fi
 endmenu
 
 mainmenu_option next_comment
-comment 'Audio outputs'
+comment 'Audio plugins'
 if [ "$CONFIG_LINUX" = "y" ]; then
    bool 'Linux OSS /dev/dsp support' CONFIG_OSS
    bool 'Esound library support' CONFIG_ESD
@@ -82,39 +149,78 @@ fi
 if [ "$CONFIG_MAC" = "y" ]; then
    bool 'CoreAudio module' CONFIG_COREAUDIO
 fi
+bool 'HD1000 audio module' CONFIG_HD1000A
 endmenu
 
 mainmenu_option next_comment
-comment 'Codecs'
-bool 'Ogg demux support' CONFIG_OGG
-bool 'A/52 support' CONFIG_A52
-bool 'libmad module' CONFIG_MAD
-bool 'ffmpeg codec' CONFIG_FFMPEG
+comment 'Codec plugins'
+bool 'Libmad module' CONFIG_MAD
+if [ "$CONFIG_MAD" = "y" ]; then
+   string '    Path to libmad' CONFIG_WITHMAD ""
+   string '    Mad tree for static linking' CONFIG_WITHMADTREE ""
+fi
+bool 'Ffmpeg codec' CONFIG_FFMPEG
 if [ "$CONFIG_FFMPEG" = "y" ]; then
-   string "ffmpeg tree" CONFIG_FFMPEG_TREE /home/videolan/ffmpeg
+   bool   '    Ffmpeg has been compiled with mp3lame support' CONFIG_WITHFFMPEGMP3LAME
+   bool   '    Ffmpeg has been compiled with faac support' CONFIG_WITHFFMPEGFAAC
+   string '    Ffmpeg tree for static linking' CONFIG_WITHFFMPEGTREE ""
+fi
+bool 'Faad codec' CONFIG_FAAD
+if [ "$CONFIG_FAAD" = "y" ]; then
+   string '    Faad tree for static linking' CONFIG_WITHFAADTREE ""
+fi
+bool 'QuickTime module' CONFIG_QUICKTIME
+bool 'A/52 support with liba52' CONFIG_A52
+if [ "$CONFIG_A52" = "y" ]; then
+   string '    A52 headers and libraries' CONFIG_WITHA52 ""
+   string '    A52dec tree for static linking' CONFIG_WITHA52TREE ""
+fi
+bool 'DTS Coherent Acoustics support with libdts' CONFIG_DTS
+if [ "$CONFIG_DTS" = "y" ]; then
+   string '    Libdts tree for static linking' CONFIG_WITHDTSTREE ""
+fi
+bool 'Flac decoder support' CONFIG_FLAC
+bool 'Libmpeg2 decoder support' CONFIG_LIBMPEG2
+if [ "$CONFIG_LIBMPEG2" = "y" ]; then
+   string '    Libmpeg2 tree for static linking' CONFIG_WITHLIBMPEG2TREE ""
 fi
-bool 'faad codec' CONFIG_FAAD
-bool 'xvid codec' CONFIG_XVID
-bool 'DV decoder support' CONFIG_DV
-bool 'flac decoder support' CONFIG_FLAC
-bool 'libmpeg2 decoder support' CONFIG_LIBMPEG2
 bool 'Vorbis decoder support' CONFIG_VORBIS
 bool 'Tremor decoder support' CONFIG_TREMOR
-bool 'tarkin codec' CONFIG_TARKIN
-bool 'theora codec' CONFIG_THEORA
-endmenu
-
-mainmenu_option next_comment
-comment 'Streaming'
-bool 'Stream output modules' CONFIG_SOUT
+bool 'Speex decoder support' CONFIG_SPEEX
+bool 'Experimental tarkin codec' CONFIG_TARKIN
+if [ "$CONFIG_TARKIN" = "y" ]; then
+   string '    Tarkin tree for static linking' CONFIG_WITHTARKINTREE ""
+fi
+bool 'Experimental theora codec' CONFIG_THEORA
+bool 'CMML support' CONFIG_CMML
 endmenu
 
 mainmenu_option next_comment
 comment 'Miscellaneous options'
-bool 'SLP service discovery support' CONFIG_SLP
+bool 'UTF8 support' CONFIG_UTF8
+bool 'GNU Portable Threads support' CONFIG_PTH
+bool 'State threads support' CONFIG_ST
+bool 'Gprof profiling' CONFIG_GPROF
+bool 'Cprof profiling' CONFIG_CPROF
+# TODO: change to a tristate choice
+# bool 'Set endianness' CONFIG_ENDIANNESS
+bool 'Mozilla plugin' CONFIG_MOZILLA
+if [ "$CONFIG_MOZILLA" = "y" ]; then
+   string '    Path to win32 mozilla sdk' CONFIG_WITHMOZILLASDKPATH ""
+fi
+bool 'Build test modules' COFIG_TESTSUITE
+# TODO: --disable-plugins
 endmenu
 
 mainmenu_option next_comment
-comment 'Compilation options'
+comment 'Optimization options'
+# TODO: add --with-tuning=ARCH
+bool 'Compiler optimizations' CONFIG_OPTIMIZATIONS
+if [ "$CONFIG_MAC" = "y" ]; then
+   bool 'AltiVec optimizations' CONFIG_ALTIVEC
+fi
 bool 'Debug mode' CONFIG_DEBUG
+bool 'Extra optimizations' CONFIG_RELEASE
+bool 'Stream output modules' CONFIG_SOUT
 endmenu
+