X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=config.in;h=a58267eec7f01e4aa05625b11ed41c6cca60b87f;hb=64813191d3aebab0bd94db025b40266c8b01cee9;hp=25c91453ac008a1bb5d4be86306e80fdd379306a;hpb=bad2afb75e673e37259d5ad8ff9b5733a08fe034;p=vlc

diff --git a/config.in b/config.in
index 25c91453ac..a58267eec7 100644
--- a/config.in
+++ b/config.in
@@ -11,15 +11,16 @@ choice 'Operating System' \
 
 mainmenu_option next_comment
 comment 'User Interfaces'
-bool 'Skins module' CONFIG_SKINS
+bool 'wxWidgets interface' CONFIG_WXWIDGETS
+if [ "$CONFIG_WXWIDGETS" = "y" ]; then
+  string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
+  string 'wx-config name' CONFIG_WITHWXCONFIG ""
+fi
+bool 'Skins interface' CONFIG_SKINS
 if [ "$CONFIG_SKINS" = "y" ]; then
   string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
 fi
 bool 'PDA interface (via Gtk2) support' CONFIG_PDA
-bool 'wxWindows support' CONFIG_WXWINDOWS
-if [ "$CONFIG_WXWINDOWS" = "y" ]; then
-  string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
-fi
 bool 'Qt embedded interface support (opie)' CONFIG_OPIE
 if [ "$CONFIG_OPIE" = "y" ]; then
   string 'Qt Embedded headers and libraries' CONFIG_WITHQTE ""
@@ -36,12 +37,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
 
@@ -85,8 +81,8 @@ 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_CDAX
-   bool '    enable audio CDDB lookups (via libcddb)' CONFIG_CDDB
+   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
@@ -149,6 +145,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
@@ -215,7 +212,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