* fixed dependencies and added options

diff --git a/build-vlc b/build-vlc
index 6b6ee48f4665cda80520c0d92e154adfd3f3329a..dfbd4bba032c34a2a6900b19b26a041272e4e7e5 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -56,6 +56,7 @@ TREMOR tremor
 TARKIN tarkin
 THEORA theora
 SOUT sout
+SLP slp
 DEBUG debug
 "
 PATHS="

diff --git a/config.in b/config.in
index 1bf5585a9e6190d50a1f22f510f7fb18211743e2..b199383d9f6bf29da35f1c96a3488ae7b1345fee 100644 (file)
--- a/config.in
+++ b/config.in
@@ -11,10 +11,10 @@ choice 'Operating System' \
 
 mainmenu_option next_comment
 comment 'Graphical User Interfaces'
-bool 'Gnome interface support' CONFIG_GNOME
-bool 'Gnome2 support' CONFIG_GNOME2
 bool 'GTK+ support' CONFIG_GTK
+dep_bool '   Gnome interface support' CONFIG_GNOME $CONFIG_GTK
 bool 'GTK2 support' CONFIG_GTK2
+dep_bool '   Gnome2 support' CONFIG_GNOME2 $CONFIG_GTK2
 bool 'Win32 skins module' CONFIG_SKINS
 bool 'Familiar GTK+ support' CONFIG_FAMILIAR
 bool 'wxWindows support' CONFIG_WXWINDOWS
@@ -108,6 +108,11 @@ comment 'Streaming'
 bool 'Stream output modules' CONFIG_SOUT
 endmenu
 
+mainmenu_option next_comment
+comment 'Miscellaneous options'
+bool 'SLP service discovery support' CONFIG_SLP
+endmenu
+
 mainmenu_option next_comment
 comment 'Compilation options'
 bool 'Debug mode' CONFIG_DEBUG

diff --git a/defconfig b/defconfig
index 8ef0801dd2fb13af0176fddb0c33e86d27190d75..10b90ae9dcf1b8a8a4aeaf60612a28a8ee561c1f 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -8,11 +8,11 @@ CONFIG_LINUX=y
 #
 # Graphical User Interfaces
 #
+CONFIG_GTK=y
 CONFIG_GNOME=y
-# CONFIG_GNOME2 is not set
-# CONFIG_GTK is not set
 # CONFIG_GTK2 is not set
-# CONFIG_SKINS is not set
+# CONFIG_GNOME2 is not set
+CONFIG_SKINS=y
 # CONFIG_FAMILIAR is not set
 # CONFIG_WXWINDOWS is not set
 # CONFIG_QT is not set
@@ -37,11 +37,11 @@ CONFIG_DVDPSI=y
 #
 # Video outputs
 #
-CONFIG_X11=y
+# CONFIG_X11 is not set
 CONFIG_XVIDEO=y
 # CONFIG_FB is not set
 # CONFIG_SDL is not set
-CONFIG_FREETYPE=y
+# CONFIG_FREETYPE is not set
 # CONFIG_QTE is not set
 # CONFIG_MGA is not set
 # CONFIG_SVGALIB is not set
@@ -53,7 +53,7 @@ CONFIG_FREETYPE=y
 # Audio outputs
 #
 CONFIG_OSS=y
-# CONFIG_ESD is not set
+CONFIG_ESD=y
 # CONFIG_ARTS is not set
 # CONFIG_ALSA is not set
 
@@ -80,6 +80,11 @@ CONFIG_VORBIS=y
 #
 CONFIG_SOUT=y
 
+#
+# Miscellaneous options
+#
+CONFIG_SLP=y
+
 #
 # Compilation options
 #