Changeset bad2afb75e673e37259d5ad8ff9b5733a08fe034

Timestamp:

17/07/05 21:26:41 (3 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

Rocky Bernstein <rocky@videolan.org> 1121628401 +0000

git-parent:

[5c9d64ef5e24ba397dfcc77a6acf0198ea70cfaf]

git-author:

Rocky Bernstein <rocky@videolan.org> 1121628401 +0000

Message:

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

Files:

• build-vlc (modified) (2 diffs)
• config.in (modified) (5 diffs)
• configure.ac (modified) (1 diff)
• defconfig (modified) (1 diff)

build-vlc

@@ -3 +3 @@
-FEATURES="
-SKINS skins2
-
+
-WXWINDOWS wxwindows
-OPIE opie
@@ -30 +30 @@
-MOD mod
-CDIO libcdio
+VCDX vcdx
+CDDAX cddax
+CDDB libcddb
-X11 x11
-XVIDEO xvideo

config.in

@@ -11 +11 @@
-
-mainmenu_option next_comment
-
+User 
-bool 'Skins module' CONFIG_SKINS
-
-
+
-  string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
-fi
-
-
+
-bool 'wxWindows support' CONFIG_WXWINDOWS
-if [ "$CONFIG_WXWINDOWS" = "y" ]; then
-  string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
-fi
-
+ (opie)
-if [ "$CONFIG_OPIE" = "y" ]; then
-  string 'Qt Embedded headers and libraries' CONFIG_WITHQTE ""
@@ -66 +64 @@
-   fi
-fi
-f
+l
-bool 'Dvbpsi ts mux and demux module' CONFIG_DVBPSI
-if [ "$CONFIG_DVBPSI" = "y" ]; then
@@ -77 +75 @@
-fi
-bool 'PVR cards support' CONFIG_PVR
-VCD support for Linux, FreeBSD, MacOS X and Win32
+built-in VCD and audio CD support
-bool 'Satellite card support' CONFIG_SATELLITE
-bool 'DVB-S/T/C cards support' CONFIG_DVB
@@ -87 +85 @@
-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
-
@@ -203 +206 @@
-comment 'Miscellaneous options'
-bool 'UTF8 support' CONFIG_UTF8
-
-
+(Pth) 
+(st) 
-bool 'Gprof profiling' CONFIG_GPROF
-bool 'Cprof profiling' CONFIG_CPROF

configure.ac

@@ -1727 +1727 @@
- 
-AC_ARG_ENABLE(vcd,
-not via libcdio
+default enabled
-
-if test "${enable_vcd}" != "no"

defconfig

@@ -7 +7 @@
-
-#
-Graphical 
+
-#
-CONFIG_GTK=y
-CONFIG_GNOME=y
-# CONFIG_GTK2 is not set
-# CONFIG_GNOME2 is not set
-CONFIG_SKINS=y
-
-WXWINDOWS
-
-
+
+PDA
+
+
-# 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
-
-#
-
+ plugin
-#
+# CONFIG_LIVEDOTCOM is not set
-CONFIG_DVD=y
-CONFIG_DVDOLD=y
-# CONFIG_DVDREAD is not set
-
+
+
+
-CONFIG_DVBPSI=y
-
+
+
-# CONFIG_V4L is not set
-
+
+
+
+
+
+
+
+
+
+
+
-
-#
-output
+plugin
-#
-
+
-CONFIG_XVIDEO=y
+CONFIG_GLX=y
-# CONFIG_FB is not set
-
-
+
+
+
+
+
+
+
+
+
-# CONFIG_QTE is not set
-MGA
+HD1000V
-# 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
-
-#
-output
+plugin
-#
-CONFIG_OSS=y
-
+
-# CONFIG_ARTS is not set
-
+
+
-
-#
-
+ plugin
-#
-
+
+
+
+
+
+
+
+
+
-CONFIG_A52=y
-
-
-
-
-
-
+
+
+
+
-# 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
-
-
-
-
-
+
-
-#
-# Miscellaneous options
-#
-
+
+
+
+
+
+
+
-
-#
-Compil
+Optimiz
-#
+# CONFIG_OPTIMIZATIONS is not set
-# CONFIG_DEBUG is not set
+# CONFIG_RELEASE is not set
+# CONFIG_SOUT is not set