* config.in: wxwindows -> wxwidgets. Added a HTTPD option

diff --git a/build-vlc b/build-vlc
index 0b2495fd3fc0a6183f28206a91fa21dfb750703c..efc18fe4134f9324a0f4ca0813c4dfcc5c653b22 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -3,7 +3,7 @@
 FEATURES="
 SKINS skins2
 PDA pda
-WXWINDOWS wxwindows
+WXWIDGETS wxwidgets
 OPIE opie
 MACOSX macosx
 QNX qnx
@@ -86,6 +86,7 @@ SOUT sout
 WITHFFMPEGMP3LAME ffmpeg-mp3lame
 WITHFFMPEGFAAC ffmpeg-faac
 GALAKTOS galaktos
+HTTPD httpd
 "
 PATHS="
 WITHXML2CONFIGPATH xml2-config-path

diff --git a/config.in b/config.in
index 4a7a5cd95ebf4d511047b9c33b67525c2ab041d8..a32e0c0f1e476d3d3fe4f7568003bc190969fbfc 100644 (file)
--- a/config.in
+++ b/config.in
@@ -16,8 +16,8 @@ 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
+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
@@ -216,6 +216,7 @@ 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
 # TODO: --disable-plugins
 endmenu
 

diff --git a/defconfig b/defconfig
index e7a616da38ca2f1ba3755126f9b91c30be889f03..a3db9502efb9273ca7b6f0fb4f408b10c1ed0aa5 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -11,7 +11,7 @@ CONFIG_LINUX=y
 CONFIG_SKINS=y
 CONFIG_WITHXML2CONFIGPATH=""
 # CONFIG_PDA is not set
-CONFIG_WXWINDOWS=y
+CONFIG_WXWIDGETS=y
 CONFIG_WITHWXCONFIGPATH=""
 # CONFIG_OPIE is not set
 # CONFIG_QNX is not set