From 1268d8c14a427eb1d048dbde0957cde9a9e77019 Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Thu, 14 May 2015 11:56:23 +0000
Subject: [PATCH] deprecated configure options cleanup in configure.in

---
 bochs/configure    | 93 +++++++++++++++-------------------------------
 bochs/configure.in | 28 +++++---------
 2 files changed, 38 insertions(+), 83 deletions(-)

diff --git a/bochs/configure b/bochs/configure
index 37b15b7a9..a0f3a7137 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 12743 2015-05-03 17:03:26Z vruppert .
+# From configure.in Id: configure.in 12763 2015-05-14 11:49:28Z sshwarts .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -1068,8 +1068,6 @@ with_svga
 with_wx
 with_all_libs
 enable_xpm
-enable_trace_cache
-enable_misaligned_sse
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1786,8 +1784,6 @@ Optional Features:
   --enable-docbook        build the Docbook documentation (yes, if docbook
                           present)
   --enable-xpm            enable the check for XPM support (yes)
-  --enable-trace-cache    support instruction trace cache (deprecated)
-  --enable-misaligned-sse misaligned SSE support (deprecated)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -5181,7 +5177,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5184 "configure"' > conftest.$ac_ext
+  echo '#line 5180 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6869,11 +6865,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6872: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6868: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6876: \$? = $ac_status" >&5
+   echo "$as_me:6872: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7102,11 +7098,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7105: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7101: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7109: \$? = $ac_status" >&5
+   echo "$as_me:7105: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7169,11 +7165,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7172: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7168: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7176: \$? = $ac_status" >&5
+   echo "$as_me:7172: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8959,7 +8955,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8962 "configure"
+#line 8958 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9057,7 +9053,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9060 "configure"
+#line 9056 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11172,11 +11168,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11175: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11171: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11179: \$? = $ac_status" >&5
+   echo "$as_me:11175: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11239,11 +11235,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11242: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11238: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11246: \$? = $ac_status" >&5
+   echo "$as_me:11242: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12264,7 +12260,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12267 "configure"
+#line 12263 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12362,7 +12358,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12365 "configure"
+#line 12361 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13185,11 +13181,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13188: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13184: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13192: \$? = $ac_status" >&5
+   echo "$as_me:13188: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13252,11 +13248,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13255: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13251: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13259: \$? = $ac_status" >&5
+   echo "$as_me:13255: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15217,11 +15213,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15220: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15216: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15224: \$? = $ac_status" >&5
+   echo "$as_me:15220: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15450,11 +15446,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15453: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15449: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15457: \$? = $ac_status" >&5
+   echo "$as_me:15453: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15517,11 +15513,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15520: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15516: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15524: \$? = $ac_status" >&5
+   echo "$as_me:15520: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17307,7 +17303,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17310 "configure"
+#line 17306 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17405,7 +17401,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17408 "configure"
+#line 17404 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19092,7 +19088,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19095 "configure"
+#line 19091 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -25714,37 +25710,6 @@ if test "$cross_configure" = 0; then
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for instruction trace cache support (deprecated)" >&5
-$as_echo_n "checking for instruction trace cache support (deprecated)... " >&6; }
-# Check whether --enable-trace-cache was given.
-if test "${enable_trace_cache+set}" = set; then :
-  enableval=$enable_trace_cache; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
-$as_echo "$enableval" >&6; }
-   as_fn_error $? "DEPRECATED - this feature will be enabled in all configurations" "$LINENO" 5
-
-else
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for misaligned SSE support (deprecated)" >&5
-$as_echo_n "checking for misaligned SSE support (deprecated)... " >&6; }
-# Check whether --enable-misaligned-sse was given.
-if test "${enable_misaligned_sse+set}" = set; then :
-  enableval=$enable_misaligned_sse; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
-$as_echo "$enableval" >&6; }
-   as_fn_error $? "DEPRECATED - moved to runtime .bochsrc option" "$LINENO" 5
-
-else
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
 
 # Create some subdirectories for when you run configure from some other
 # directory.
diff --git a/bochs/configure.in b/bochs/configure.in
index ce52785c5..3f7180f2a 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -3049,25 +3049,15 @@ fi
 
 dnl // DEPRECATED configure options - force users to remove them
 
-AC_MSG_CHECKING(for instruction trace cache support (deprecated))
-AC_ARG_ENABLE(trace-cache,
-  AS_HELP_STRING([--enable-trace-cache], [support instruction trace cache (deprecated)]),
-  [AC_MSG_RESULT($enableval)
-   AC_MSG_ERROR([DEPRECATED - this feature will be enabled in all configurations])
-  ],
-  [
-   AC_MSG_RESULT(no)
-  ])
-
-AC_MSG_CHECKING(for misaligned SSE support (deprecated))
-AC_ARG_ENABLE(misaligned-sse,
-  AS_HELP_STRING([--enable-misaligned-sse], [misaligned SSE support (deprecated)]),
-  [AC_MSG_RESULT($enableval)
-   AC_MSG_ERROR([DEPRECATED - moved to runtime .bochsrc option])
-  ],
-  [
-   AC_MSG_RESULT(no)
-  ])
+dnl AC_MSG_CHECKING(for misaligned SSE support (deprecated))
+dnl AC_ARG_ENABLE(misaligned-sse,
+dnl   AS_HELP_STRING([--enable-misaligned-sse], [misaligned SSE support (deprecated)]),
+dnl   [AC_MSG_RESULT($enableval)
+dnl    AC_MSG_ERROR([DEPRECATED - moved to runtime .bochsrc option])
+dnl   ],
+dnl   [
+dnl    AC_MSG_RESULT(no)
+dnl   ])
 
 # Create some subdirectories for when you run configure from some other
 # directory.