X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=config.in;h=bd5b7ae58ba10d9e55019a98df0497b146d9de97;hb=4d79e227ff00cd77567b27b02e8847d6774029ff;hp=44857df365bc27d81b6222f74b242e45d2fcf455;hpb=c0a1dbea40aa511d41f644c0d19b51fffc384a5a;p=vlc

diff --git a/config.in b/config.in
index 44857df365..bd5b7ae58b 100644
--- a/config.in
+++ b/config.in
@@ -10,19 +10,14 @@ choice 'Operating System' \
     Win32		CONFIG_WIN32" Linux
 
 mainmenu_option next_comment
-comment 'Interfaces'
-bool 'Skins module' CONFIG_SKINS
-bool 'Skins2 module' CONFIG_SKINS2
-if [ "$CONFIG_SKINS2" = "y" ]; then
+comment 'User Interfaces'
+bool 'QT4 interface' CONFIG_QT4
+bool 'Skins interface' CONFIG_SKINS
+if [ "$CONFIG_SKINS" = "y" ]; then
   string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
 fi
-bool 'Familiar GTK+ support' CONFIG_FAMILIAR
-# TODO: --enable-pda
-bool 'wxWindows support' CONFIG_WXWINDOWS
-if [ "$CONFIG_WXWINDOWS" = "y" ]; then
-  string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
-fi
-bool 'Qt embedded interface support' CONFIG_OPIE
+bool 'PDA interface (via Gtk2) support' CONFIG_PDA
+bool 'Qt embedded interface support (opie)' CONFIG_OPIE
 if [ "$CONFIG_OPIE" = "y" ]; then
   string 'Qt Embedded headers and libraries' CONFIG_WITHQTE ""
 fi
@@ -38,13 +33,7 @@ if [ "$CONFIG_GOOM" = "y" ]; then
   string 'goom tree for static linking' CONFIG_WITHGOOMTREE ""
 fi
 bool 'GaLaktos visualization plugin' CONFIG_GALAKTOS
-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
@@ -65,7 +54,7 @@ if [ "$CONFIG_DVD" = "y" ]; then
       string '        dvdnav-config path' CONFIG_WITHDVDNAVCONFIGPATH ""
    fi
 fi
-boof 'Win32 DirectShow support' CONFIG_DSHOW
+bool '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 ""
@@ -76,7 +65,7 @@ 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 'built-in VCD and audio CD support' CONFIG_VCD
 bool 'Satellite card support' CONFIG_SATELLITE
 bool 'DVB-S/T/C cards support' CONFIG_DVB
 if [ "$CONFIG_DVB" = "y" ]; then
@@ -85,6 +74,12 @@ fi
 bool 'Ogg demux support' CONFIG_OGG
 bool 'Matroska demux support' CONFIG_MKV
 bool 'Mod demux support' CONFIG_MOD
+bool 'CD input and control library (libcdio) support' CONFIG_CDIO
+if [ "$CONFIG_CDIO" = "y" ]; then
+   bool '    audio CD module with CD-Text & CD-Paranoia (via libcdio)' CONFIG_CDDAX
+   bool '    CDDB lookups (via libcddb) for audio CD' CONFIG_CDDB
+   bool '    VCD module with navigation (via libcdio and libvcdinfo)' CONFIG_VCDX
+fi
 endmenu
 
 mainmenu_option next_comment
@@ -127,10 +122,6 @@ 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
@@ -145,6 +136,7 @@ if [ "$CONFIG_LINUX" = "y" ]; then
    bool 'Esound library support' CONFIG_ESD
    bool 'aRts sound server' CONFIG_ARTS
    bool 'ALSA sound support for Linux' CONFIG_ALSA
+   bool 'JACK Audio Connection Kit support' CONFIG_JACK
 fi
 if [ "$CONFIG_WIN32" = "y" ]; then
    bool 'Win32 waveOut module' CONFIG_WAVEOUT
@@ -201,8 +193,8 @@ endmenu
 mainmenu_option next_comment
 comment 'Miscellaneous options'
 bool 'UTF8 support' CONFIG_UTF8
-bool 'GNU Portable Threads support' CONFIG_PTH
-bool 'State threads support' CONFIG_ST
+bool 'GNU Portable Threads (Pth) support' CONFIG_PTH
+bool 'State threads (st) support' CONFIG_ST
 bool 'Gprof profiling' CONFIG_GPROF
 bool 'Cprof profiling' CONFIG_CPROF
 # TODO: change to a tristate choice
@@ -211,7 +203,8 @@ 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
+bool 'Build test modules' CONFIG_TESTSUITE
+bool 'Enable http daemon' CONFIG_HTTPD
 # TODO: --disable-plugins
 endmenu