- removed BX_USE_CONFIG_INTERFACE stuff. A configuration interface is always
present and a quickstart option exists, too - improved check for GTK 2.x (only needed if basename of wx is 'wx_gtk2') - moved/added some deprecated configure options to the end of the script. These checks should force users and distrubutors to update their config options.
This commit is contained in:
Volker Ruppert
parent
85afaff11d
commit
cc59e24639
@ -48,8 +48,6 @@
|
||||
#define BX_EXIT(x) ::exit(x)
|
||||
#endif
|
||||
|
||||
#define BX_USE_CONFIG_INTERFACE 1
|
||||
|
||||
// I have tested the following combinations:
|
||||
// * processors=1, bootstrap=0, ioapic_id=1 (uniprocessor system)
|
||||
// * processors=2, bootstrap=0, ioapic_id=2
|
||||
|
||||
201
bochs/configure
vendored
201
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.295 2005/09/10 16:40:14 vruppert Exp .
|
||||
# From configure.in Id: configure.in,v 1.296 2005/10/03 10:28:03 vruppert Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
@ -1033,7 +1033,6 @@ Optional Features:
|
||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||
--enable-ltdl-install install libltdl
|
||||
--disable-largefile omit support for large files
|
||||
--enable-config-interface turns on/off configuration interface
|
||||
--enable-new-pit use Greg Alexander's new PIT model
|
||||
--enable-idle-hack use Roland Mainz's idle hack
|
||||
--enable-plugins enable plugins
|
||||
@ -1069,7 +1068,6 @@ Optional Features:
|
||||
--enable-instrumentation compile in support for instrumentation
|
||||
--enable-simid=0 or 1 CPU simulator ID if using more than one
|
||||
--enable-num-sim=1 or 2 number of CPU simulators
|
||||
--enable-time0=n start at n (obsolete)
|
||||
--enable-raw-serial use raw serial port access
|
||||
--enable-vbe use VESA BIOS extensions
|
||||
--enable-clgd54xx enable CLGD54XX emulation
|
||||
@ -1088,6 +1086,10 @@ Optional Features:
|
||||
--enable-iodebug enable I/O interface to debugger
|
||||
--enable-docbook build the Docbook documentation
|
||||
--enable-xpm enable the check for XPM support
|
||||
--enable-time0=n start at n (deprecated)
|
||||
--enable-config-interface turns on/off configuration interface (deprecated)
|
||||
--enable-control-panel turns on/off contol panel (deprecated)
|
||||
--enable-vga use VGA emulation (deprecated)
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
@ -3661,7 +3663,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3664 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3666 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4769,7 +4771,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:4772:" \
|
||||
echo "$as_me:4774:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -5807,11 +5809,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:5810: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:5812: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:5814: \$? = $ac_status" >&5
|
||||
echo "$as_me:5816: \$? = $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
|
||||
@ -6040,11 +6042,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:6043: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6045: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6047: \$? = $ac_status" >&5
|
||||
echo "$as_me:6049: \$? = $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
|
||||
@ -6107,11 +6109,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:6110: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6112: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:6114: \$? = $ac_status" >&5
|
||||
echo "$as_me:6116: \$? = $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
|
||||
@ -8273,7 +8275,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8276 "configure"
|
||||
#line 8278 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8371,7 +8373,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8374 "configure"
|
||||
#line 8376 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10550,11 +10552,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:10553: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:10555: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:10557: \$? = $ac_status" >&5
|
||||
echo "$as_me:10559: \$? = $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
|
||||
@ -10617,11 +10619,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:10620: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:10622: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:10624: \$? = $ac_status" >&5
|
||||
echo "$as_me:10626: \$? = $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
|
||||
@ -11960,7 +11962,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11963 "configure"
|
||||
#line 11965 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12058,7 +12060,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12061 "configure"
|
||||
#line 12063 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12881,11 +12883,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:12884: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12886: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12888: \$? = $ac_status" >&5
|
||||
echo "$as_me:12890: \$? = $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
|
||||
@ -12948,11 +12950,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:12951: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12953: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12955: \$? = $ac_status" >&5
|
||||
echo "$as_me:12957: \$? = $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
|
||||
@ -14964,11 +14966,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:14967: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14969: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14971: \$? = $ac_status" >&5
|
||||
echo "$as_me:14973: \$? = $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
|
||||
@ -15197,11 +15199,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:15200: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15202: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15204: \$? = $ac_status" >&5
|
||||
echo "$as_me:15206: \$? = $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
|
||||
@ -15264,11 +15266,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:15267: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15269: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15271: \$? = $ac_status" >&5
|
||||
echo "$as_me:15273: \$? = $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
|
||||
@ -17430,7 +17432,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17433 "configure"
|
||||
#line 17435 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17528,7 +17530,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17531 "configure"
|
||||
#line 17533 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19847,7 +19849,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19850 "configure"
|
||||
#line 19852 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -32595,42 +32597,6 @@ fi
|
||||
fi
|
||||
fi # end of if $with_all_libs = yes
|
||||
|
||||
use_config_interface=1
|
||||
echo "$as_me:$LINENO: checking for configuration interface" >&5
|
||||
echo $ECHO_N "checking for configuration interface... $ECHO_C" >&6
|
||||
# Check whether --enable-config-interface or --disable-config-interface was given.
|
||||
if test "${enable_config_interface+set}" = set; then
|
||||
enableval="$enable_config_interface"
|
||||
if test "$enableval" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
use_config_interface=1
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
use_config_interface=0
|
||||
fi
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
use_config_interface=1
|
||||
|
||||
|
||||
fi;
|
||||
|
||||
if test "$use_config_interface" = 1; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_USE_CONFIG_INTERFACE 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_USE_CONFIG_INTERFACE 0
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking for new PIT model" >&5
|
||||
echo $ECHO_N "checking for new PIT model... $ECHO_C" >&6
|
||||
# Check whether --enable-new-pit or --disable-new-pit was given.
|
||||
@ -35711,24 +35677,6 @@ _ACEOF
|
||||
|
||||
|
||||
|
||||
fi;
|
||||
|
||||
echo "$as_me:$LINENO: checking for specified CMOS start time" >&5
|
||||
echo $ECHO_N "checking for specified CMOS start time... $ECHO_C" >&6
|
||||
# Check whether --enable-time0 or --disable-time0 was given.
|
||||
if test "${enable_time0+set}" = set; then
|
||||
enableval="$enable_time0"
|
||||
echo "$as_me:$LINENO: result: $enableval" >&5
|
||||
echo "${ECHO_T}$enableval" >&6
|
||||
{ { echo "$as_me:$LINENO: error: obsolete option - use runtime option 'clock' instead" >&5
|
||||
echo "$as_me: error: obsolete option - use runtime option 'clock' instead" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
fi;
|
||||
|
||||
if test "$bx_plugins" = 0; then
|
||||
@ -36930,6 +36878,7 @@ echo "$as_me:$LINENO: checking for wxWidgets library version" >&5
|
||||
echo $ECHO_N "checking for wxWidgets library version... $ECHO_C" >&6
|
||||
if test x$WX_CONFIG != xnot_found; then
|
||||
WX_VERSION=`$WX_CONFIG --version`
|
||||
WX_BASENAME=`$WX_CONFIG --basename`
|
||||
|
||||
# test that version >= 2.3.2. Anybody have a better way to do this? Yuck.
|
||||
case x$WX_VERSION in
|
||||
@ -36937,7 +36886,12 @@ if test x$WX_CONFIG != xnot_found; then
|
||||
x2.3.[01]) ;; # less than version 2.3.2
|
||||
x2.3.[2-4]*) ok_wx_version=1 ;; # 2.3.2 or greater
|
||||
x2.[4-5]*) ok_wx_version=1 ;; # version 2.4 / 2.5
|
||||
x2.[6-9]*) ok_wx_version=1 wx_needs_gtk2=1 ;; # version 2.6 or greater
|
||||
x2.[6-9]*) # version 2.6 or greater
|
||||
ok_wx_version=1
|
||||
if test "$WX_BASENAME" = "wx_gtk2"; then
|
||||
wx_needs_gtk2=1
|
||||
fi
|
||||
;;
|
||||
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
|
||||
*) ;; # who knows?
|
||||
esac
|
||||
@ -39249,6 +39203,79 @@ if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for specified CMOS start time (deprecated)" >&5
|
||||
echo $ECHO_N "checking for specified CMOS start time (deprecated)... $ECHO_C" >&6
|
||||
# Check whether --enable-time0 or --disable-time0 was given.
|
||||
if test "${enable_time0+set}" = set; then
|
||||
enableval="$enable_time0"
|
||||
echo "$as_me:$LINENO: result: $enableval" >&5
|
||||
echo "${ECHO_T}$enableval" >&6
|
||||
{ { echo "$as_me:$LINENO: error: deprecated option - use runtime option 'clock' instead" >&5
|
||||
echo "$as_me: error: deprecated option - use runtime option 'clock' instead" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
fi;
|
||||
|
||||
echo "$as_me:$LINENO: checking for configuration interface (deprecated)" >&5
|
||||
echo $ECHO_N "checking for configuration interface (deprecated)... $ECHO_C" >&6
|
||||
# Check whether --enable-config-interface or --disable-config-interface was given.
|
||||
if test "${enable_config_interface+set}" = set; then
|
||||
enableval="$enable_config_interface"
|
||||
echo "$as_me:$LINENO: result: $enableval" >&5
|
||||
echo "${ECHO_T}$enableval" >&6
|
||||
{ { echo "$as_me:$LINENO: error: deprecated option - configuration interface is always enabled" >&5
|
||||
echo "$as_me: error: deprecated option - configuration interface is always enabled" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
fi;
|
||||
|
||||
echo "$as_me:$LINENO: checking for control panel (deprecated)" >&5
|
||||
echo $ECHO_N "checking for control panel (deprecated)... $ECHO_C" >&6
|
||||
# Check whether --enable-control-panel or --disable-control-panel was given.
|
||||
if test "${enable_control_panel+set}" = set; then
|
||||
enableval="$enable_control_panel"
|
||||
echo "$as_me:$LINENO: result: $enableval" >&5
|
||||
echo "${ECHO_T}$enableval" >&6
|
||||
{ { echo "$as_me:$LINENO: error: deprecated option - configuration interface is always enabled" >&5
|
||||
echo "$as_me: error: deprecated option - configuration interface is always enabled" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
fi;
|
||||
|
||||
echo "$as_me:$LINENO: checking for VGA emulation (deprecated)" >&5
|
||||
echo $ECHO_N "checking for VGA emulation (deprecated)... $ECHO_C" >&6
|
||||
# Check whether --enable-vga or --disable-vga was given.
|
||||
if test "${enable_vga+set}" = set; then
|
||||
enableval="$enable_vga"
|
||||
echo "$as_me:$LINENO: result: $enableval" >&5
|
||||
echo "${ECHO_T}$enableval" >&6
|
||||
{ { echo "$as_me:$LINENO: error: deprecated option - standard VGA emulation is always enabled" >&5
|
||||
echo "$as_me: error: deprecated option - standard VGA emulation is always enabled" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
fi;
|
||||
|
||||
# Create some subdirectories for when you run configure from some other
|
||||
# directory.
|
||||
if test ! -d instrument; then mkdir instrument; fi
|
||||
|
||||
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.295 2005-09-10 16:40:14 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.296 2005-10-03 10:28:03 vruppert Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -387,29 +387,6 @@ if test "$with_all_libs" = yes; then
|
||||
fi
|
||||
fi # end of if $with_all_libs = yes
|
||||
|
||||
use_config_interface=1
|
||||
AC_MSG_CHECKING(for configuration interface)
|
||||
AC_ARG_ENABLE(config-interface,
|
||||
[ --enable-config-interface turns on/off configuration interface],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
use_config_interface=1
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
use_config_interface=0
|
||||
fi],
|
||||
[
|
||||
AC_MSG_RESULT(yes)
|
||||
use_config_interface=1
|
||||
]
|
||||
)
|
||||
|
||||
if test "$use_config_interface" = 1; then
|
||||
AC_DEFINE(BX_USE_CONFIG_INTERFACE, 1)
|
||||
else
|
||||
AC_DEFINE(BX_USE_CONFIG_INTERFACE, 0)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for new PIT model)
|
||||
AC_ARG_ENABLE(new-pit,
|
||||
[ --enable-new-pit use Greg Alexander's new PIT model],
|
||||
@ -1458,16 +1435,6 @@ AC_ARG_ENABLE(num-sim,
|
||||
]
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING(for specified CMOS start time)
|
||||
AC_ARG_ENABLE(time0,
|
||||
[ --enable-time0=n start at n (obsolete)],
|
||||
[AC_MSG_RESULT($enableval)
|
||||
AC_MSG_ERROR([obsolete option - use runtime option 'clock' instead])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl // serial mode 'socket' needs wsock32.dll in non-plugin mode
|
||||
if test "$bx_plugins" = 0; then
|
||||
case $target in
|
||||
@ -2090,6 +2057,7 @@ wx_needs_gtk2=0
|
||||
AC_MSG_CHECKING(for wxWidgets library version)
|
||||
if test x$WX_CONFIG != xnot_found; then
|
||||
WX_VERSION=`$WX_CONFIG --version`
|
||||
WX_BASENAME=`$WX_CONFIG --basename`
|
||||
[
|
||||
# test that version >= 2.3.2. Anybody have a better way to do this? Yuck.
|
||||
case x$WX_VERSION in
|
||||
@ -2097,7 +2065,12 @@ if test x$WX_CONFIG != xnot_found; then
|
||||
x2.3.[01]) ;; # less than version 2.3.2
|
||||
x2.3.[2-4]*) ok_wx_version=1 ;; # 2.3.2 or greater
|
||||
x2.[4-5]*) ok_wx_version=1 ;; # version 2.4 / 2.5
|
||||
x2.[6-9]*) ok_wx_version=1 wx_needs_gtk2=1 ;; # version 2.6 or greater
|
||||
x2.[6-9]*) # version 2.6 or greater
|
||||
ok_wx_version=1
|
||||
if test "$WX_BASENAME" = "wx_gtk2"; then
|
||||
wx_needs_gtk2=1
|
||||
fi
|
||||
;;
|
||||
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
|
||||
*) ;; # who knows?
|
||||
esac
|
||||
@ -2751,6 +2724,48 @@ if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl // DEPRECATED configure options - force users to remove them
|
||||
|
||||
AC_MSG_CHECKING(for specified CMOS start time (deprecated))
|
||||
AC_ARG_ENABLE(time0,
|
||||
[ --enable-time0=n start at n (deprecated)],
|
||||
[AC_MSG_RESULT($enableval)
|
||||
AC_MSG_ERROR([deprecated option - use runtime option 'clock' instead])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for configuration interface (deprecated))
|
||||
AC_ARG_ENABLE(config-interface,
|
||||
[ --enable-config-interface turns on/off configuration interface (deprecated)],
|
||||
[AC_MSG_RESULT($enableval)
|
||||
AC_MSG_ERROR([deprecated option - configuration interface is always enabled])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for control panel (deprecated))
|
||||
AC_ARG_ENABLE(control-panel,
|
||||
[ --enable-control-panel turns on/off contol panel (deprecated)],
|
||||
[AC_MSG_RESULT($enableval)
|
||||
AC_MSG_ERROR([deprecated option - configuration interface is always enabled])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for VGA emulation (deprecated))
|
||||
AC_ARG_ENABLE(vga,
|
||||
[ --enable-vga use VGA emulation (deprecated)],
|
||||
[AC_MSG_RESULT($enableval)
|
||||
AC_MSG_ERROR([deprecated option - standard VGA emulation is always enabled])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
# Create some subdirectories for when you run configure from some other
|
||||
# directory.
|
||||
if test ! -d instrument; then mkdir instrument; fi
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: main.cc,v 1.293 2005-08-20 16:41:41 vruppert Exp $
|
||||
// $Id: main.cc,v 1.294 2005-10-03 10:28:03 vruppert Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -575,11 +575,6 @@ int bx_init_main (int argc, char *argv[])
|
||||
#endif
|
||||
#endif /* if BX_PLUGINS */
|
||||
|
||||
#if !BX_USE_CONFIG_INTERFACE
|
||||
// this allows people to get quick start behavior by default
|
||||
SIM->get_param_enum(BXP_BOCHS_START)->set (BX_QUICK_START);
|
||||
#endif
|
||||
|
||||
int norcfile = 1;
|
||||
|
||||
if (load_rcfile) {
|
||||
@ -791,9 +786,6 @@ int bx_init_hardware()
|
||||
if (SIM->get_param_enum(BXP_BOCHS_START)->get ()==BX_QUICK_START) {
|
||||
for (int level=0; level<N_LOGLEV; level++) {
|
||||
int action = SIM->get_default_log_action (level);
|
||||
#if !BX_USE_CONFIG_INTERFACE
|
||||
if (action == ACT_ASK) action = ACT_FATAL;
|
||||
#endif
|
||||
io->set_log_action (level, action);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user