comparison configure @ 5201:40c6df15c3df

a bit modified runtime fix patch by Fredrik Kuivinen <[e-mail]>

5200:022c957633a3

# 1st pass checking for vital options
_cc=gcc
test "$CC" && _cc="$CC"
_as=auto
_enable_xp=no
for ac_option do
  case "$ac_option" in
  --target=*)
    _target=`echo $ac_option | cut -d '=' -f 2`
    ;;

  --with-extraincdir=*)
    _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-extralibdir=*)
    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  esac
done

# Determine our OS name and CPU architecture

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

  echocheck "CPU type"
  echores "$pname"

fi


if [ "$host_arch" = alpha ]; then
  echocheck "CPU type"

    echocheck "GCC & CPU optimization abilities"
cat > $TMPC << EOF
int main(void) { return 0; }
EOF

    if test "$proc" = "k7" ; then
      cc_check -march=$proc -mcpu=$proc || proc=athlon
    fi
    if test "$proc" = "athlon" ; then
      cc_check -march=$proc -mcpu=$proc || proc=pentiumpro

    fi
    if test "$proc" = "i386" ; then
      cc_check -march=$proc -mcpu=$proc  || proc=error
    fi
    if test "$proc" = "error" ; then
      die "Your $_cc does not support even \"i386\" for '-march' and '-mcpu'."
    fi

    _march="-march=$proc"
    _mcpu="-mcpu=$proc"

    ## Gabucino : --target takes effect here (hopefully...) by overwriting
    ##             autodetected mcpu/march parameters
    if test "$_target" ; then
      _march="-march=$host_arch"

echocheck "binutils"
_binutils=no
$_as libac3/downmix/downmix_i386.S -o $TMPO > /dev/null 2>&1 && _binutils=yes
echores "$_binutils"

if x86 ; then
  extcheck() {
    if test "$1" = yes ; then
      echocheck "kernel support of $2"
      cat > $TMPC <<EOF
int main(void){__asm__ __volatile__ ("$3":::"memory");return(0);}

_vo2=no
_language=en
_shm=auto
_linux_devfs=no
_i18n=no
_runtime_cpudetection=yes

for ac_option do
  case "$ac_option" in
  # Skip 1st pass
  --target=*) ;;

  --disable-gcc-checking) ;;
  --enable-static*) ;;
  --disable-static*) ;;
  --with-extraincdir=*) ;;
  --with-extralibdir=*) ;;


  # Real 2nd pass
  --enable-mencoder)	_mencoder=yes	;;
  --disable-mencoder)	_mencoder=no	;;
  --enable-i18n)	_i18n=yes	;;
  --disable-i18n)	_i18n=no	;;
  --enable-runtime-cpudetection)  _runtime_cpudetection=yes ;;
  --disable-runtime-cpudetection) _runtime_cpudetection=no  ;;
  --enable-x11)		_x11=yes	;;
  --disable-x11)	_x11=no		;;
  --enable-xv)		_xv=yes		;;
  --disable-xv)		_xv=no		;;
  --enable-sdl)		_sdl=yes	;;

5201:40c6df15c3df

# 1st pass checking for vital options
_cc=gcc
test "$CC" && _cc="$CC"
_as=auto
_enable_xp=no
_runtime_cpudetection=yes
for ac_option do
  case "$ac_option" in
  --target=*)
    _target=`echo $ac_option | cut -d '=' -f 2`
    ;;

  --with-extraincdir=*)
    _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-extralibdir=*)
    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --enable-runtime-cpudetection)
    _runtime_cpudetection=yes
    ;;
  --disable-runtime-cpudetection)
    _runtime_cpudetection=no
    ;;
  esac
done

# Determine our OS name and CPU architecture

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

  echocheck "CPU type"
  echores "$pname"

  if test "$_runtime_cpudetection" = yes ; then
    _mmx=yes
    _3dnow=yes
    _3dnowex=yes
    _mmx2=yes
    _sse=yes
    _sse2=yes
    _mtrr=yes
  fi

fi


if [ "$host_arch" = alpha ]; then
  echocheck "CPU type"

    echocheck "GCC & CPU optimization abilities"
cat > $TMPC << EOF
int main(void) { return 0; }
EOF
  if test "_$runtime_cpudetection" = "no" ; then
    if test "$proc" = "k7" ; then
      cc_check -march=$proc -mcpu=$proc || proc=athlon
    fi
    if test "$proc" = "athlon" ; then
      cc_check -march=$proc -mcpu=$proc || proc=pentiumpro

    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=""
    else
      _march="-march=$proc"
      _mcpu="-mcpu=$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
      _march="-march=$host_arch"

echocheck "binutils"
_binutils=no
$_as libac3/downmix/downmix_i386.S -o $TMPO > /dev/null 2>&1 && _binutils=yes
echores "$_binutils"

if x86 && test "$_runtime_cpudetection" = no ; then
  extcheck() {
    if test "$1" = yes ; then
      echocheck "kernel support of $2"
      cat > $TMPC <<EOF
int main(void){__asm__ __volatile__ ("$3":::"memory");return(0);}

_vo2=no
_language=en
_shm=auto
_linux_devfs=no
_i18n=no

for ac_option do
  case "$ac_option" in
  # Skip 1st pass
  --target=*) ;;

  --disable-gcc-checking) ;;
  --enable-static*) ;;
  --disable-static*) ;;
  --with-extraincdir=*) ;;
  --with-extralibdir=*) ;;
  --enable-runtime-cpudetection) ;;
  --disable-runtime-cpudetection) ;;

  # Real 2nd pass
  --enable-mencoder)	_mencoder=yes	;;
  --disable-mencoder)	_mencoder=no	;;
  --enable-i18n)	_i18n=yes	;;
  --disable-i18n)	_i18n=no	;;
  --enable-x11)		_x11=yes	;;
  --disable-x11)	_x11=no		;;
  --enable-xv)		_xv=yes		;;
  --disable-xv)		_xv=no		;;
  --enable-sdl)		_sdl=yes	;;