backport [13054]

[vlc] / config.in

diff --git a/config.in b/config.in
index 4a7a5cd95ebf4d511047b9c33b67525c2ab041d8..59c724c38a4b3453ebc9b68f49e39516e18a6b1e 100644 (file)
--- 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
 
@@ -215,7 +211,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