X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=config.in;h=0a1b35bec6244a9d911b626adac7489e13146283;hb=60e28ddcc0c593d9d1184e0668bc260a1cff73f5;hp=a32e0c0f1e476d3d3fe4f7568003bc190969fbfc;hpb=bfb18bbde687c9d59c139e9a19dd2cc0d6e57c7f;p=vlc

diff --git a/config.in b/config.in
index a32e0c0f1e..0a1b35bec6 100644
--- a/config.in
+++ b/config.in
@@ -11,15 +11,17 @@ 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 'QT4 interface' CONFIG_QT4
+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 'wxWidgets support' CONFIG_WXWIDGETS
-if [ "$CONFIG_WXWIDGETS" = "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,13 +38,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
@@ -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,8 +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 'Enable http daemon' COFIG_HTTPD
+bool 'Build test modules' CONFIG_TESTSUITE
+bool 'Enable http daemon' CONFIG_HTTPD
 # TODO: --disable-plugins
 endmenu