[MPlayer-cvslog] r37414 - trunk/configure

[ib]

Author: ib
Date: Fri Jun  5 09:29:20 2015
New Revision: 37414

Log:
Revert r37408.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Jun  4 18:06:17 2015	(r37413)
+++ trunk/configure	Fri Jun  5 09:29:20 2015	(r37414)
@@ -544,7 +544,6 @@ Available values are: all $msg_lang_all
 
 Miscellaneous options:
   --enable-runtime-cpudetection    enable runtime CPU detection [disable]
-  --disable-optimization disable compile time CPU code optimization [enable]
   --enable-cross-compile enable cross-compilation [autodetect]
   --cc=COMPILER          C compiler to build MPlayer [gcc]
   --host-cc=COMPILER     C compiler for tools needed while building [gcc]
@@ -657,7 +656,6 @@ _as=auto
 _nm=auto
 _yasm=yasm
 _runtime_cpudetection=no
-_optimization=yes
 _cross_compile=auto
 _prefix="/usr/local"
 ffmpeg_a=auto
@@ -1006,8 +1004,6 @@ for ac_option do
     ;;
   --enable-runtime-cpudetection)    _runtime_cpudetection=yes   ;;
   --disable-runtime-cpudetection)   _runtime_cpudetection=no    ;;
-  --enable-optimization)            _optimization=yes           ;;
-  --disable-optimization)           _optimization=no            ;;
   --enable-cross-compile)           _cross_compile=yes          ;;
   --disable-cross-compile)          _cross_compile=no           ;;
   --enable-mencoder)    _mencoder=yes   ;;
@@ -2174,11 +2170,9 @@ case "$host_arch" in
         cpuopt=-mcpu
     fi
 
-  test "$_optimization" = "no" && proc=none
-
-  echocheck "GCC & CPU optimization"
+    echocheck "GCC & CPU optimization abilities"
   if test "$_runtime_cpudetection" = no ; then
-    if test "$_optimization" = "yes" && test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then
+    if test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then
       cflag_check -march=native && proc=native
     fi
     if test "$proc" = "amdfam10"; then
@@ -2224,13 +2218,13 @@ case "$host_arch" in
       cflag_check -march=$proc $cpuopt=$proc  || proc=i386
     fi
     if test "$proc" = "i386" ; then
-      cflag_check -march=$proc $cpuopt=$proc  || proc=none
+      cflag_check -march=$proc $cpuopt=$proc  || proc=error
     fi
-    if test "$proc" = "none" ; then
-      test "$_optimization" = "yes" && echores "CPU optimization disabled. CPU not recognized or your compiler is too old."
+    if test "$proc" = "error" ; then
+        echores "CPU optimization disabled. CPU not recognized or your compiler is too old."
       _mcpu=""
       _march=""
-      _optimizing="$proc"
+      _optimizing=""
     elif test "$proc" = "i586-i686"; then
       _march="-march=i586"
       _mcpu="$cpuopt=i686"
@@ -2338,16 +2332,14 @@ case "$host_arch" in
         esac
         ;;
       *)
-        proc=none;;
+        proc=error;;
       esac
     fi # test "$_runtime_cpudetection" = no
 
-    test "$_optimization" = "no" && proc=none
-
-    echocheck "GCC & CPU optimization"
+    echocheck "GCC & CPU optimization abilities"
     # This is a stripped-down version of the i386 fallback.
     if test "$_runtime_cpudetection" = no ; then
-      if test "$_optimization" = "yes" && test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then
+      if test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then
         cflag_check -march=native && proc=native
       fi
       # --- AMD processors ---
@@ -2361,7 +2353,7 @@ case "$host_arch" in
       # versions don't really support 64-bit on amd64.
       # Is this a valid assumption? -Corey
       if test "$proc" = "athlon-xp"; then
-        cflag_check -march=$proc $cpuopt=$proc || proc=none
+        cflag_check -march=$proc $cpuopt=$proc || proc=error
       fi
       # --- Intel processors ---
       if test "$proc" = "atom" || test "$proc" = "corei7-avx" || test "$proc" = "corei7"; then
@@ -2377,13 +2369,13 @@ case "$host_arch" in
         cflag_check -march=$proc $cpuopt=$proc || proc=pentium4
       fi
       if test "$proc" = "pentium4"; then
-        cflag_check -march=$proc $cpuopt=$proc || proc=none
+        cflag_check -march=$proc $cpuopt=$proc || proc=error
       fi
 
       _march="-march=$proc"
       _mcpu="$cpuopt=$proc"
-      if test "$proc" = "none" ; then
-        test "$_optimization" = "yes" && echores "CPU optimization disabled. CPU not recognized or your compiler is too old."
+      if test "$proc" = "error" ; then
+        echores "CPU optimization disabled. CPU not recognized or your compiler is too old."
         _mcpu=""
         _march=""
       fi
@@ -2511,9 +2503,7 @@ case "$host_arch" in
         echores "$proc"
     fi
 
-    test "$_optimization" = "no" && proc=none
-
-    echocheck "GCC & CPU optimization"
+    echocheck "GCC & CPU optimization abilities"
 
     if test -n "$proc"; then
         case "$proc" in
@@ -2606,16 +2596,14 @@ EOF
     esac
     echores "$proc"
 
-    test "$_optimization" = "no" && proc=none
-
-    echocheck "GCC & CPU optimization"
+    echocheck "GCC & CPU optimization abilities"
     if test "$proc" = "ev68" ; then
       cc_check -mcpu=$proc || proc=ev67
     fi
     if test "$proc" = "ev67" ; then
       cc_check -mcpu=$proc || proc=ev6
     fi
-    test "$_optimization" = "yes" && _mcpu="-mcpu=$proc"
+    _mcpu="-mcpu=$proc"
     echores "$proc"
 
     test $_fast_clz = "auto" && _fast_clz=yes