diff --git a/configure b/configure index fcec49e49c..6fbf5fd6b6 100755 --- a/configure +++ b/configure @@ -126,7 +126,7 @@ Installation directories: Optional features: --disable-mencoder disable mencoder [autodetect] - --enable-largefiles enable support for files >2^32 bytes long [disable] + --enable-largefiles enable support for files > 2^32 Bytes [disable] --enable-linux-devfs set default devices to devfs ones [disable] --enable-termcap use termcap database for key codes [autodetect] --enable-lirc enable LIRC (remote control) support [autodetect] @@ -145,7 +145,7 @@ Optional features: --disable-divx4linux disable DivX4linux codec [autodetect] --enable-opendivx enable _old_ OpenDivx codec [disable] --disable-libavcodec disable libavcodec [autodetect] - --enable-libfame enable libfame realtime-encoder [autodetect] + --enable-libfame enable libfame realtime encoder [autodetect] --enable-vorbis build with OggVorbis support [autodetect] --enable-faad build with FAAD (AAC) support [autodetect] --disable-iconv do not use iconv(3) function [autodetect] @@ -203,8 +203,8 @@ Audio: Miscellaneous options: --cc=COMPILER use this C compiler to build MPlayer [gcc] --target=PLATFORM target platform (i386-linux, arm-linux, etc) - --enable-static build a statically linked binary. If more linking - options needed : --enable-static="-lslang -lncurses" + --enable-static build a statically linked binary. Set further linking + options with --enable-static="-lslang -lncurses" --language=xx select a language [en] (Available: $LANGUAGES) @@ -220,7 +220,7 @@ Advanced options: --enable-profile compile profiling information into mplayer [disable] --disable-sighandler disable sighandler for crashes [enable] -Hazardous options a.k.a. "DO NOT BUGREPORT ANYTHING !" +Hazardous options a.k.a. "DO NOT REPORT ANY BUGS!" --disable-gcc-checking disable gcc version checking [enable] Use these options if autodetection fails: @@ -230,16 +230,16 @@ Use these options if autodetection fails: --with-x11libdir=DIR X library files in DIR --with-dxr2incdir=DIR DXR2 headers in DIR --with-csslibdir=DIR libcss in DIR - --with-madlibdir=DIR libmad (libmad shared lib.) in DIR + --with-madlibdir=DIR libmad (libmad shared library) in DIR --with-mlibdir=DIR libmlib (MLIB support) in DIR (Solaris only) --with-libdvdnav=DIR libdvdnav in DIR --with-win32libdir=DIR W*ndows DLL files in DIR --with-xanimlibdir=DIR XAnim DLL files in DIR --with-reallibdir=DIR RealPlayer DLL files in DIR - --with-xvidcore=PATH path to XviD libcore.a (e.g: /opt/lib/libcore.a) - --with-sdl-config=PATH path to sdl*-config (e.g.: /opt/bin/sdl-config) - --with-gtk-config=PATH path to gtk*-config (e.g.: /opt/bin/gtk-config) - --with-glib-config=PATH path to glib*-config (e.g.: /opt/bin/glib-config) + --with-xvidcore=PATH path to XviD libcore.a (e.g. /opt/lib/libcore.a) + --with-sdl-config=PATH path to sdl*-config (e.g. /opt/bin/sdl-config) + --with-gtk-config=PATH path to gtk*-config (e.g. /opt/bin/gtk-config) + --with-glib-config=PATH path to glib*-config (e.g. /opt/bin/glib-config) --with-dvdnav-config=PATH path to dvdnav-config EOF @@ -380,7 +380,7 @@ TMPS="$I/mplayer-conf-$RANDOM-$$.S" # from /usr we should be sure that there no effects from other compilers # (libraries) which might be installed into /usr/local. Let users use this # stuff explicitly as command line argument. In other words: It would be -# resonable have or only /usr/include or only /usr/local/include. +# resonable to have only /usr/include or only /usr/local/include. if freebsd ; then _ld_extra="$_ld_extra -L/usr/local/lib" @@ -420,22 +420,22 @@ if test "$_skip_cc_check" != yes ; then if test "$cc_verc_fail" = yes ; then cat < $TMPC << EOF #int main(void) { return 0; } @@ -1685,10 +1685,10 @@ else elif ( cc_check -pthread ) ; then _ld_pthread='-pthread' else - die "Static lib pthread not found. (needed by windows and networking stuff)" + die "Static lib pthread not found (needed by Windows and networking stufff)." fi else - die "Lib pthread not found. (needed by windows and networking stuff)" + die "Lib pthread not found (needed by Windows and networking stuff)." fi fi echores "yes (using $_ld_pthread)" @@ -3292,13 +3292,13 @@ EOF Your C++ runtime environment is broken. -Hints: Does $_cc support C++ ? Have you a C++ compiler installed ? - Are the C++ libraries correctly installed ? - Check for libstdc++ and in (/etc/)ld.so.conf +Hints: Does $_cc support C++? Do you have you a C++ compiler installed? + Are the C++ libraries correctly installed? + Check for libstdc++ and in (/etc/)ld.so.conf. If you do not need DirectShow support, you can also use: ./configure --disable-dshow -to disable building of the C++ based DirectShow code. +to disable building the C++ based DirectShow code. EOF die "$_cc's C++ is broken" @@ -3920,11 +3920,11 @@ elif test -z "$CFLAGS" ; then else cat <' EOF @@ -4172,10 +4172,10 @@ cat > config.h << EOF /* -------- This file has been automatically generated by configure --------- Note: Any changes in it will be lost when you run configure again. */ -/* use GNU internationalisation */ +/* use GNU internationalization */ $_def_i18n -/* Runtime Cpudetection */ +/* Runtime CPU detection */ $_def_runtime_cpudetection /* "restrict" keyword */ @@ -4224,8 +4224,8 @@ $_def_stddef /* Define to include support for XviD/Divx4Linux/OpenDivx */ $_def_divx -/* Define for using new XviD/DivX4Linux library, instead of open-source OpenDivX */ -/* You have to change DECORE_LIBS in config.mak too! */ +/* Define to use the new XviD/DivX4Linux library instead of open source OpenDivX */ +/* You have to change DECORE_LIBS in config.mak, too! */ $_def_decore /* Define if you are using DivX5Linux Decore library */ @@ -4260,13 +4260,13 @@ $_def_mp1e #define AVI_SYNC_BPS 1 /* Undefine this if you do not want to select mono audio (left or right) - with a stereo MPEG layer 2/3 audio stream. The command-line option + with a stereo MPEG layer 2/3 audio stream. The command line option -stereo has three possible values (0 for stereo, 1 for left-only, 2 for right-only), with 0 being the default. */ #define USE_FAKE_MONO 1 -/* Undefine this if your soundcard driver has no working select(). +/* Undefine this if your sound card driver has no working select(). If you have kernel Oops, player hangups, or just no audio, you should try to recompile MPlayer with this option disabled! */ $_def_select @@ -4286,7 +4286,7 @@ $_def_rtc /* Define this if your system has the header file for the OSS sound interface */ $_def_sys_soundcard -/* Define this if you system has the header file for the OSS sound interface +/* Define this if your system has the header file for the OSS sound interface * in /usr/include */ $_def_soundcard @@ -4339,10 +4339,10 @@ $_def_css /* DVD navigation support using libdvdnav */ $_def_dvdnav -/* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */ +/* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */ #define MPEG12_POSTPROC 1 -/* Define this to enable image postprocessing in libavcodec (requires FAST cpu!) */ +/* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */ $_def_ffpostprocess /* Define to include support for OpenDivx postprocessing */ @@ -4621,8 +4621,8 @@ Config files successfully generated by ./configure ! Video output: $_novomodules 'config.h' and 'config.mak' contain your configuration options. -Note: if you alter theses files (for instance CFLAGS) MPlayer may no longer - compile *** DON'T BUGREPORT if you tweak these files *** +Note: If you alter theses files (for instance CFLAGS) MPlayer may no longer + compile *** DO NOT REPORT BUGS if you tweak these files *** 'make' will now compile MPlayer and 'make install' will install it. Note: On non-Linux systems you might need to use 'gmake' instead of 'make'. @@ -4631,7 +4631,7 @@ EOF if test "$_mtrr" = yes ; then - echo "Please check mtrr settings at /proc/mtrr (see DOCS/video.html#2.2.1.1)" + echo "Please check mtrr settings at /proc/mtrr (see DOCS/video.html#mtrr)" echo fi @@ -4643,8 +4643,8 @@ support has therefore been disabled. Please upgrade to a more recent version (version 1.1.8 and above are known to work). You may get this library from: http://www.libsdl.org -You need to re-run ./configure and recompile after updating SDL. If you are -only interested in the libSDL audio drivers, then older version might work. +You need to rerun ./configure and recompile after updating SDL. If you are +only interested in the libSDL audio drivers, then an older version might work. Use --enable-sdl to force usage of libSDL. @@ -4668,8 +4668,8 @@ EOF : else cat <