Mercurial > mplayer.hg
changeset 4543:193cb24dca2b
fix display of echocheck on sunos
added missing '--with-mlibdir' to help message
replaced \t by ' ' in help section
uses $MLIBHOME as a hint to set _mlibdir (Solaris)
small indent fixes (dunno why people did not align them ?)
(bugs & fixes for sun by meleth@freebox.com)
| author | pl |
|---|---|
| date | Tue, 05 Feb 2002 22:57:17 +0000 |
| parents | e67d400b6fde |
| children | 8903732ae2e2 |
| files | configure |
| diffstat | 1 files changed, 17 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Feb 05 22:01:49 2002 +0000 +++ b/configure Tue Feb 05 22:57:17 2002 +0000 @@ -15,11 +15,12 @@ # _ld_opt : ' -L/path/dir -lopt ' that is: some GCC option # _inc_opt : ' -I/path/dir/include ' # +# In this file, a tab is 8 chars and indentation shift is 2 characters +# # GOTCHAS: # - config files are currently: # config.h config.mak libvo/config.mak libao2/config.mak # Gui/config.mak libvo2/config.mak -# - removed dvbincdir/madincdir/cssincdir: add them to extraincdir # ############################################################################# @@ -76,7 +77,7 @@ # Use this before starting a check echocheck() { echo "============ Checking for $@ ============" >> "$TMPLOG" - echo "$_echo_n" "Checking for $@ ... $_echo_c" + echo ${_echo_n} "Checking for $@ ... ${_echo_c}" } # Use this to echo the results of a check @@ -90,8 +91,8 @@ # Check how echo works in this /bin/sh case `echo -n` in - -n) _echo_n='' _echo_c='\c' ;; # SysV echo - *) _echo_n=-n _echo_c='' ;; # BSD echo + -n) _echo_n= _echo_c='\c' ;; # SysV echo + *) _echo_n='-n ' _echo_c= ;; # BSD echo esac LANGUAGES=`echo help_mp-??.h | sed "s/help_mp-\(..\).h/\1/g"` @@ -132,7 +133,7 @@ (use this option if it does not compile) [enable] --disable-streaming disable network streaming support (support for: http/mms/rtp) [enable] - --disable-vidix disable VIDIX stuff [enable] + --disable-vidix disable VIDIX stuff [enable] --enable-new-input enable new input system [disable] --enable-joystick enable joystick support in new input [disable] Video: @@ -153,7 +154,7 @@ --enable-xinerama build with Xinerama support for X11 [autodetect] --enable-x11 build with X11 render support [autodetect] --enable-fbdev build with FBDev render support [autodetect] - --enable-fbdev=nocopy yuv12 converts directly into framebuffer + --enable-fbdev=nocopy yuv12 converts directly into framebuffer --enable-mlib build with MLIB support (Solaris only) [autodetect] --enable-3dfx build with 3dfx support [disable] --enable-tdfxfb build with tdfxfb support [disable] @@ -196,6 +197,7 @@ --with-x11libdir=DIR X library files in DIR --with-csslibdir=DIR libcss in DIR --with-madlibdir=DIR libmad (libmad shared lib.) in DIR + --with-mlibdir=DIR libmlib (MLIB support) in DIR (Solaris only) --with-win32libdir=DIR W*ndows DLL files in DIR --with-xanimlibdir=DIR XAnim DLL files in DIR --with-sdl-config=PATH path to sdl*-config (e.g.: /opt/bin/sdl-config) @@ -848,10 +850,10 @@ --disable-streaming) _streaming=no ;; --enable-vidix) _vidix=yes ;; --disable-vidix) _vidix=no ;; - --enable-new-input) _new_input=yes ;; - --disable-new-input) _new_input=no ;; - --enable-joystick) _joystick=yes ;; - --disable-joystick) _joystick=no ;; + --enable-new-input) _new_input=yes ;; + --disable-new-input) _new_input=no ;; + --enable-joystick) _joystick=yes ;; + --disable-joystick) _joystick=no ;; --enable-divx4linux) _divx4linux=yes ;; --disable-divx4linux) _divx4linux=no ;; --enable-opendivx) _opendivx=yes ;; @@ -871,7 +873,7 @@ --enable-directfb) _directfb=yes ;; --disable-directfb) _directfb=no ;; --enable-zr) _zr=yes ;; - --disable-zr) _zr=no ;; + --disable-zr) _zr=no ;; --enable-mtrr) _mtrr=yes ;; --disable-mtrr) _mtrr=no ;; --enable-largefiles) _largefiles=yes ;; @@ -975,9 +977,10 @@ done # Atmos: moved this here, to be correct, if --prefix is specified -test -z "$_datadir" && _datadir=$_prefix"/share/mplayer" -test -z "$_confdir" && _confdir=$_datadir -test -z "$_libdir" && _libdir=$_prefix"/lib/mplayer" +test -z "$_datadir" && _datadir="$_prefix/share/mplayer" +test -z "$_confdir" && _confdir="$_datadir" +test -z "$_libdir" && _libdir="$_prefix/lib/mplayer" +test -z "$_mlibdir" && _mlibdir="$MLIBHOME" if x86 ; then # Checking assembler (_as) compatibility...