Revise better for current default options and names as seen by configure.ac

diff --git a/build-vlc b/build-vlc
index 8d6edf12ce18f407cacf2b6d866bc68c7680448a..0b2495fd3fc0a6183f28206a91fa21dfb750703c 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -2,7 +2,7 @@
 
 FEATURES="
 SKINS skins2
-FAMILIAR familiar
+PDA pda
 WXWINDOWS wxwindows
 OPIE opie
 MACOSX macosx
@@ -29,6 +29,9 @@ OGG ogg
 MKV mkv
 MOD mod
 CDIO libcdio
+VCDX vcdx
+CDDAX cddax
+CDDB libcddb
 X11 x11
 XVIDEO xvideo
 GLX glx

diff --git a/config.in b/config.in
index 7ecd13e5534090795b75f0a30bfd49ce883203e1..25c91453ac008a1bb5d4be86306e80fdd379306a 100644 (file)
--- a/config.in
+++ b/config.in
@@ -10,19 +10,17 @@ choice 'Operating System' \
     Win32              CONFIG_WIN32" Linux
 
 mainmenu_option next_comment
-comment 'Interfaces'
+comment 'User Interfaces'
 bool 'Skins module' CONFIG_SKINS
-bool 'Skins2 module' CONFIG_SKINS2
-if [ "$CONFIG_SKINS2" = "y" ]; then
+if [ "$CONFIG_SKINS" = "y" ]; then
   string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
 fi
-bool 'Familiar GTK+ support' CONFIG_FAMILIAR
-# TODO: --enable-pda
+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' CONFIG_OPIE
+bool 'Qt embedded interface support (opie)' CONFIG_OPIE
 if [ "$CONFIG_OPIE" = "y" ]; then
   string 'Qt Embedded headers and libraries' CONFIG_WITHQTE ""
 fi
@@ -65,7 +63,7 @@ if [ "$CONFIG_DVD" = "y" ]; then
       string '        dvdnav-config path' CONFIG_WITHDVDNAVCONFIGPATH ""
    fi
 fi
-boof 'Win32 DirectShow support' CONFIG_DSHOW
+bool 'Win32 DirectShow support' CONFIG_DSHOW
 bool 'Dvbpsi ts mux and demux module' CONFIG_DVBPSI
 if [ "$CONFIG_DVBPSI" = "y" ]; then
    string '    libdvbpsi headers and libraries' CONFIG_WITHDVBPSI ""
@@ -76,7 +74,7 @@ if [ "$CONFIG_V4L" = "y" ]; then
    string '    path to a v4l-enabled kernel tree' CONFIG_WITHV4L
 fi
 bool 'PVR cards support' CONFIG_PVR
-bool 'VCD support for Linux, FreeBSD, MacOS X and Win32' CONFIG_VCD
+bool 'built-in VCD and audio CD support' CONFIG_VCD
 bool 'Satellite card support' CONFIG_SATELLITE
 bool 'DVB-S/T/C cards support' CONFIG_DVB
 if [ "$CONFIG_DVB" = "y" ]; then
@@ -86,6 +84,11 @@ bool 'Ogg demux support' CONFIG_OGG
 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 '    VCD module with navigation (via libcdio and libvcdinfo)' CONFIG_VCDX
+fi
 endmenu
 
 mainmenu_option next_comment
@@ -202,8 +205,8 @@ endmenu
 mainmenu_option next_comment
 comment 'Miscellaneous options'
 bool 'UTF8 support' CONFIG_UTF8
-bool 'GNU Portable Threads support' CONFIG_PTH
-bool 'State threads support' CONFIG_ST
+bool 'GNU Portable Threads (Pth) support' CONFIG_PTH
+bool 'State threads (st) support' CONFIG_ST
 bool 'Gprof profiling' CONFIG_GPROF
 bool 'Cprof profiling' CONFIG_CPROF
 # TODO: change to a tristate choice

diff --git a/configure.ac b/configure.ac
index c417f186c4522c811c24324d290df14a18ec9b0d..e574b18d004b7cc8c21341e6b7e1f23161aa7af9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1726,7 +1726,7 @@ AC_ARG_ENABLE(cdda,
   [  --enable-cdda           audio CD via built-in VCD (default enabled)])
  
 AC_ARG_ENABLE(vcd,
-  [  --enable-vcd            built-in VCD (not via libcdio)])
+  [  --enable-vcd            built-in VCD (default enabled)])
 
 if test "${enable_vcd}" != "no"
 then

diff --git a/defconfig b/defconfig
index 10026734d681a98afa975dd29f73fed97066c766..e7a616da38ca2f1ba3755126f9b91c30be889f03 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -6,86 +6,125 @@ CONFIG_LINUX=y
 # CONFIG_WIN32 is not set
 
 #
-# Graphical User Interfaces
+# User Interfaces
 #
-CONFIG_GTK=y
-CONFIG_GNOME=y
-# CONFIG_GTK2 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
-# CONFIG_KDE is not set
+CONFIG_WITHXML2CONFIGPATH=""
+# CONFIG_PDA is not set
+CONFIG_WXWINDOWS=y
+CONFIG_WITHWXCONFIGPATH=""
 # CONFIG_OPIE is not set
 # CONFIG_QNX is not set
 # CONFIG_NCURSES is not set
 # CONFIG_XOSD is not set
+CONFIG_VISUAL=y
+# CONFIG_GOOM is not set
+# CONFIG_GALAKTOS is not set
+# CONFIG_SLP is not set
+# CONFIG_LIRC is not set
+CONFIG_JOYSTICK=y
+# CONFIG_CORBA is not set
 
 #
-# Inputs
+# Input plugins
 #
+# CONFIG_LIVEDOTCOM is not set
 CONFIG_DVD=y
-CONFIG_DVDOLD=y
 # CONFIG_DVDREAD is not set
-# CONFIG_DVDPLAY is not set
+CONFIG_DVDNAV=y
+CONFIG_WITHDVDNAVCONFIGPATH=""
+# CONFIG_DSHOW is not set
 CONFIG_DVBPSI=y
-# CONFIG_VCD is not set
+CONFIG_WITHDVBPSI=""
+CONFIG_WITHDVBPSITREE=""
 # CONFIG_V4L is not set
-# CONFIG_SAT is not set
+# CONFIG_PVR is not set
+CONFIG_VCD=y
+# CONFIG_SATELLITE is not set
+# CONFIG_DVB is not set
+CONFIG_OGG=y
+CONFIG_MKV=y
+CONFIG_MOD=y
+CONFIG_CDIO=y
+# CONFIG_CDAX is not set
+CONFIG_CDDB=y
+# CONFIG_VCDX is not set
 
 #
-# Video outputs
+# Video plugins
 #
-# CONFIG_X11 is not set
+CONFIG_X11=y
 CONFIG_XVIDEO=y
+CONFIG_GLX=y
 # CONFIG_FB is not set
-# CONFIG_SDL is not set
-# CONFIG_FREETYPE is not set
-# CONFIG_QTE is not set
 # CONFIG_MGA is not set
+CONFIG_SDL=y
+CONFIG_WITHSDLCONFIGPATH=""
+CONFIG_WITHSDLPREFIX=""
+CONFIG_FREETYPE=y
+CONFIG_WITHFREETYPECONFIGPATH=""
+CONFIG_FRIBIDI=y
+CONFIG_WITHFRIBIDICONFIGPATH=""
+# CONFIG_SVG is not set
+# CONFIG_QTE is not set
+# CONFIG_HD1000V is not set
 # CONFIG_SVGALIB is not set
 # CONFIG_GGI is not set
 # CONFIG_GLIDE is not set
 # CONFIG_AA is not set
+# CONFIG_CACA is not set
 
 #
-# Audio outputs
+# Audio plugins
 #
 CONFIG_OSS=y
-CONFIG_ESD=y
+# CONFIG_ESD is not set
 # CONFIG_ARTS is not set
-# CONFIG_ALSA is not set
+CONFIG_ALSA=y
+# CONFIG_HD1000A is not set
 
 #
-# Codecs
+# Codec plugins
 #
-CONFIG_OGG=y
-CONFIG_A52=y
 CONFIG_MAD=y
+CONFIG_WITHMAD=""
+CONFIG_WITHMADTREE=""
 CONFIG_FFMPEG=y
-CONFIG_FFMPEG_TREE="/home/cyril/ffmpeg"
+# CONFIG_WITHFFMPEGMP3LAME is not set
+# CONFIG_WITHFFMPEGFAAC is not set
+CONFIG_WITHFFMPEGTREE=""
 # CONFIG_FAAD is not set
-# CONFIG_XVID is not set
-# CONFIG_DV is not set
+# CONFIG_QUICKTIME is not set
+CONFIG_A52=y
+CONFIG_WITHA52=""
+CONFIG_WITHA52TREE=""
+CONFIG_DTS=y
+CONFIG_WITHDTSTREE=""
 # CONFIG_FLAC is not set
 CONFIG_LIBMPEG2=y
+CONFIG_WITHLIBMPEG2TREE=""
 CONFIG_VORBIS=y
 # CONFIG_TREMOR is not set
+CONFIG_SPEEX=y
 # CONFIG_TARKIN is not set
 # CONFIG_THEORA is not set
-
-#
-# Streaming
-#
-CONFIG_SOUT=y
+CONFIG_CMML=y
 
 #
 # Miscellaneous options
 #
-CONFIG_SLP=y
+# CONFIG_UTF8 is not set
+# CONFIG_PTH is not set
+# CONFIG_ST is not set
+# CONFIG_GPROF is not set
+# CONFIG_CPROF is not set
+# CONFIG_MOZILLA is not set
+# COFIG_TESTSUITE is not set
 
 #
-# Compilation options
+# Optimization options
 #
+# CONFIG_OPTIMIZATIONS is not set
 # CONFIG_DEBUG is not set
+# CONFIG_RELEASE is not set
+# CONFIG_SOUT is not set