comparison configure @ 9184:67474c57719e

some typos and rewordings

9183:7bf676137c4d

fi

# Try to find the available options for the current CPU
if x86 || ppc; then
  if test -r /proc/cpuinfo ; then
    # linux with /proc mounted, extract cpu information from it
    _cpuinfo="cat /proc/cpuinfo"
  elif test -r /compat/linux/proc/cpuinfo ; then
    # FreeBSD with linux emulation /proc mounted,
    # extract cpu information from it
    _cpuinfo="cat /compat/linux/proc/cpuinfo"
  elif x86; then
    # all other OS try to extract cpu information from a small helper
    # program TOOLS/cpuinfo instead
    $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
    _cpuinfo="TOOLS/cpuinfo"
  fi

  echores "$pvendor ($pfamily:$pmodel:$pstepping)"

  echocheck "CPU type"
  echores "$pname"

  # just leaving this here becouse the non-x86 optims
  if test "$_runtime_cpudetection" = yes ; then
    if x86; then
      _mmx=yes
      _3dnow=yes
      _3dnowex=yes

    6) iproc=686
	if test "$pmodel" -ge 7; then
		proc=athlon-4
	elif test "$pmodel" -ge 6; then
		# only Athlon XP supports ssem MP, Duron etc not
		# but most of them are cpuid 666, so check if sse detected
		# btw. there is also athlon-mp opt, but we need extended
		# cpuid to detect if cpu is SMP capable -> athlon-mp ::atmos
		if test "$_sse" = yes && test "$pstepping" -ge 2; then
			proc=athlon-xp
		else
			proc=athlon-4
		fi

    ;;
  *)
    proc=i586 iproc=586 ;;
  esac

    # check that gcc supports our cpu, if not, fallback to earlier ones
    # LGB: check -mcpu and -march swithing step by step with enabling
    # to fall back till 386.

    echocheck "GCC & CPU optimization abilities"
cat > $TMPC << EOF

    fi
    if test "$proc" = "i386" ; then
      cc_check -march=$proc -mcpu=$proc  || proc=error
    fi
    if test "$proc" = "error" ; then
      echores "Your $_cc does not support even \"i386\" for '-march' and '-mcpu'."
      _mcpu=""
      _march=""
      _optimizing=""
    elif test "$proc" = "i586-i686"; then
      _march="-march=i586"

      _march="-march=$proc"
      _mcpu="-mcpu=$proc"
      _optimizing="$proc"
    fi
  else
    # i686 is probably the most common cpu - optimize to it
    _mcpu="-mcpu=i686"
    # at least i486 required, for bswap instruction
    _march="-march=i486"
    cc_check $_mcpu || _mcpu=""
    cc_check $_march $_mcpu || _march=""
  fi

    ## Gabucino : --target takes effect here (hopefully...) by overwriting
    ##             autodetected mcpu/march parameters
    if test "$_target" ; then
      # TODO: it may be a good idea to check GCC and fallback in all cases
      if test "$host_arch" = "i586-i686"; then
        _march="-march=i586"
        _mcpu="-mcpu=i686"
      else      
        _march="-march=$host_arch"

  --enable-3dnowex) _3dnow=yes _3dnowex=yes ;;
  --disable-3dnowex) _3dnowex=no ;;
  --enable-altivec) _altivec=yes ;;
  --disable-altivec) _altivec=no ;;
  --enable-mmx)	_mmx=yes ;;
  --disable-mmx) # without mmx 3Dnow! and stuff is also not possible
        _3dnow=no _3dnowex=no _mmx=no _mmx2=no ;;

  --enable-win32) _win32=yes ;;
  --disable-win32) _win32=no _dshow=no ;;
  --enable-dshow) _win32=yes _dshow=yes ;;

    echo "WARNING! If you want to run MPlayer on this system, get prepared for problems!"
    echo "2.2.x has limited SSE support. Upgrade the kernel or use --disable-sse if you"
    echo "experience crashes. MPlayer tries to autodetect if your kernel correctly"
    echo "supports SSE, but you have been warned! If you are using a kernel older than"
    echo "2.2.x you must upgrade it to get SSE support!"
#    die "old kernel for this cpu" # works fine on some 2.2.x so don't die (later check will test)
  else
    echores "$kernel_version, ok"
  fi
fi

if test "$_vidix" = auto ; then
  _vidix=no
  # should check for x86 systems supporting vidix (does qnx have vidix?)
  x86 && _vidix=yes
  cygwin && _vidix=no
  qnx && _vidix=no
  sunos && _vidix=no
fi

int main(void) { return 0; }
EOF
_soundcard=no
cc_check && _soundcard=yes
if linux || test "$_ossaudio" != no ; then
  # use soundcard.h on linux, or when OSS support is enabled
  echores "$_soundcard"
else
  # we don't want to use soundcard.h on non-linux if no OSS support enabled!
  echores "$_soundcard, but ignored!"
  _soundcard=no
fi
if test "$_soundcard" = yes ; then
  _def_soundcard='#define HAVE_SOUNDCARD_H 1'

test "$_debug" != "" && _def_debug='#define MP_DEBUG 1'

_def_linux='#undef TARGET_LINUX'
linux && _def_linux='#define TARGET_LINUX 1'

# TODO cleanup the vidix stuff here
_def_vidix='#define CONFIG_VIDIX 1'
test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX'
if test "$_vidix" = yes && test "$_x11" = yes; then
  _vosrc="$_vosrc vo_xvidix.c"
  _vomodules="xvidix $_vomodules"

$_def_use_aton

/* enables / disables cdparanoia support */
$_def_cdparanoia

/* enables / disables vidix usage */
$_def_vidix

/* enables / disables new input joystick support */
$_def_joystick

9184:67474c57719e

fi

# Try to find the available options for the current CPU
if x86 || ppc; then
  if test -r /proc/cpuinfo ; then
    # Linux with /proc mounted, extract CPU information from it
    _cpuinfo="cat /proc/cpuinfo"
  elif test -r /compat/linux/proc/cpuinfo ; then
    # FreeBSD with Linux emulation /proc mounted,
    # extract CPU information from it
    _cpuinfo="cat /compat/linux/proc/cpuinfo"
  elif x86; then
    # all other OSes try to extract CPU information from a small helper
    # program TOOLS/cpuinfo instead
    $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
    _cpuinfo="TOOLS/cpuinfo"
  fi

  echores "$pvendor ($pfamily:$pmodel:$pstepping)"

  echocheck "CPU type"
  echores "$pname"

  # leaving this here because of the non-x86 optimizations
  if test "$_runtime_cpudetection" = yes ; then
    if x86; then
      _mmx=yes
      _3dnow=yes
      _3dnowex=yes

    6) iproc=686
	if test "$pmodel" -ge 7; then
		proc=athlon-4
	elif test "$pmodel" -ge 6; then
		# only Athlon XP supports ssem MP, Duron etc not
		# but most of them are CPUID 666, so check if sse detected
		# btw. there is also athlon-mp opt, but we need extended
		# CPUID to detect if CPU is SMP capable -> athlon-mp ::atmos
		if test "$_sse" = yes && test "$pstepping" -ge 2; then
			proc=athlon-xp
		else
			proc=athlon-4
		fi

    ;;
  *)
    proc=i586 iproc=586 ;;
  esac

    # check that gcc supports our CPU, if not, fall back to earlier ones
    # LGB: check -mcpu and -march swithing step by step with enabling
    # to fall back till 386.

    echocheck "GCC & CPU optimization abilities"
cat > $TMPC << EOF

    fi
    if test "$proc" = "i386" ; then
      cc_check -march=$proc -mcpu=$proc  || proc=error
    fi
    if test "$proc" = "error" ; then
      echores "Your $_cc does not even support \"i386\" for '-march' and '-mcpu'."
      _mcpu=""
      _march=""
      _optimizing=""
    elif test "$proc" = "i586-i686"; then
      _march="-march=i586"

      _march="-march=$proc"
      _mcpu="-mcpu=$proc"
      _optimizing="$proc"
    fi
  else
    # i686 is probably the most common CPU - optimize for it
    _mcpu="-mcpu=i686"
    # at least i486 required, for bswap instruction
    _march="-march=i486"
    cc_check $_mcpu || _mcpu=""
    cc_check $_march $_mcpu || _march=""
  fi

    ## Gabucino : --target takes effect here (hopefully...) by overwriting
    ##             autodetected mcpu/march parameters
    if test "$_target" ; then
      # TODO: it may be a good idea to check GCC and fall back in all cases
      if test "$host_arch" = "i586-i686"; then
        _march="-march=i586"
        _mcpu="-mcpu=i686"
      else      
        _march="-march=$host_arch"

  --enable-3dnowex) _3dnow=yes _3dnowex=yes ;;
  --disable-3dnowex) _3dnowex=no ;;
  --enable-altivec) _altivec=yes ;;
  --disable-altivec) _altivec=no ;;
  --enable-mmx)	_mmx=yes ;;
  --disable-mmx) # 3Dnow! and MMX2 require MMX
        _3dnow=no _3dnowex=no _mmx=no _mmx2=no ;;

  --enable-win32) _win32=yes ;;
  --disable-win32) _win32=no _dshow=no ;;
  --enable-dshow) _win32=yes _dshow=yes ;;

    echo "WARNING! If you want to run MPlayer on this system, get prepared for problems!"
    echo "2.2.x has limited SSE support. Upgrade the kernel or use --disable-sse if you"
    echo "experience crashes. MPlayer tries to autodetect if your kernel correctly"
    echo "supports SSE, but you have been warned! If you are using a kernel older than"
    echo "2.2.x you must upgrade it to get SSE support!"
#    die "Your kernel is too old for this CPU." # works fine on some 2.2.x so don't die (later check will test)
  else
    echores "$kernel_version, ok"
  fi
fi

if test "$_vidix" = auto ; then
  _vidix=no
  # should check for x86 systems supporting VIDIX (does QNX have VIDIX?)
  x86 && _vidix=yes
  cygwin && _vidix=no
  qnx && _vidix=no
  sunos && _vidix=no
fi

int main(void) { return 0; }
EOF
_soundcard=no
cc_check && _soundcard=yes
if linux || test "$_ossaudio" != no ; then
  # use soundcard.h on Linux, or when OSS support is enabled
  echores "$_soundcard"
else
  # we don't want to use soundcard.h on non-Linux if OSS support not enabled!
  echores "$_soundcard, but ignored!"
  _soundcard=no
fi
if test "$_soundcard" = yes ; then
  _def_soundcard='#define HAVE_SOUNDCARD_H 1'

test "$_debug" != "" && _def_debug='#define MP_DEBUG 1'

_def_linux='#undef TARGET_LINUX'
linux && _def_linux='#define TARGET_LINUX 1'

# TODO cleanup the VIDIX stuff here
_def_vidix='#define CONFIG_VIDIX 1'
test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX'
if test "$_vidix" = yes && test "$_x11" = yes; then
  _vosrc="$_vosrc vo_xvidix.c"
  _vomodules="xvidix $_vomodules"

$_def_use_aton

/* enables / disables cdparanoia support */
$_def_cdparanoia

/* enables / disables VIDIX usage */
$_def_vidix

/* enables / disables new input joystick support */
$_def_joystick