- add messages about external device models and external cpu memory,
no change of any substance here!
This commit is contained in:
Bryce Denney
parent
8ab8c40108
commit
ef907186ef
44
bochs/configure
vendored
44
bochs/configure
vendored
@ -3875,10 +3875,13 @@ fi
|
||||
|
||||
PRIMARY_TARGET='bochs'
|
||||
|
||||
echo $ac_n "checking for external device models""... $ac_c" 1>&6
|
||||
echo "configure:3880: checking for external device models" >&5
|
||||
# Check whether --enable-external-device-models or --disable-external-device-models was given.
|
||||
if test "${enable_external_device_models+set}" = set; then
|
||||
enableval="$enable_external_device_models"
|
||||
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define BX_PROVIDE_DEVICE_MODELS 0
|
||||
EOF
|
||||
@ -3888,6 +3891,7 @@ EOF
|
||||
|
||||
else
|
||||
|
||||
echo "$ac_t""no" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define BX_PROVIDE_DEVICE_MODELS 1
|
||||
EOF
|
||||
@ -3899,10 +3903,13 @@ fi
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking for external cpu memory""... $ac_c" 1>&6
|
||||
echo "configure:3908: checking for external cpu memory" >&5
|
||||
# Check whether --enable-external-cpu-memory or --disable-external-cpu-memory was given.
|
||||
if test "${enable_external_cpu_memory+set}" = set; then
|
||||
enableval="$enable_external_cpu_memory"
|
||||
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define BX_PROVIDE_CPU_MEMORY 0
|
||||
EOF
|
||||
@ -3914,6 +3921,7 @@ EOF
|
||||
|
||||
else
|
||||
|
||||
echo "$ac_t""no" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define BX_PROVIDE_CPU_MEMORY 1
|
||||
EOF
|
||||
@ -3985,7 +3993,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for gui library to use""... $ac_c" 1>&6
|
||||
echo "configure:3989: checking for gui library to use" >&5
|
||||
echo "configure:3997: checking for gui library to use" >&5
|
||||
|
||||
if (test "$with_x11" != yes) && \
|
||||
(test "$with_beos" != yes) && \
|
||||
@ -4131,7 +4139,7 @@ fi
|
||||
|
||||
if test "$use_curses" = yes; then
|
||||
echo $ac_n "checking for mvaddch in -lcurses""... $ac_c" 1>&6
|
||||
echo "configure:4135: checking for mvaddch in -lcurses" >&5
|
||||
echo "configure:4143: checking for mvaddch in -lcurses" >&5
|
||||
ac_lib_var=`echo curses'_'mvaddch | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4139,7 +4147,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4143 "configure"
|
||||
#line 4151 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4150,7 +4158,7 @@ int main() {
|
||||
mvaddch()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4171,7 +4179,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for mvaddch in -lncurses""... $ac_c" 1>&6
|
||||
echo "configure:4175: checking for mvaddch in -lncurses" >&5
|
||||
echo "configure:4183: checking for mvaddch in -lncurses" >&5
|
||||
ac_lib_var=`echo ncurses'_'mvaddch | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4179,7 +4187,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lncurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4183 "configure"
|
||||
#line 4191 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4190,7 +4198,7 @@ int main() {
|
||||
mvaddch()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4211,7 +4219,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for mvaddch in -ltermlib""... $ac_c" 1>&6
|
||||
echo "configure:4215: checking for mvaddch in -ltermlib" >&5
|
||||
echo "configure:4223: checking for mvaddch in -ltermlib" >&5
|
||||
ac_lib_var=`echo termlib'_'mvaddch | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4219,7 +4227,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltermlib $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4223 "configure"
|
||||
#line 4231 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4230,7 +4238,7 @@ int main() {
|
||||
mvaddch()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4259,18 +4267,18 @@ fi
|
||||
if test "$with_rfb" = yes; then
|
||||
# first see if compiler takes "-pthread" argument
|
||||
echo $ac_n "checking for -pthread arg to compiler""... $ac_c" 1>&6
|
||||
echo "configure:4263: checking for -pthread arg to compiler" >&5
|
||||
echo "configure:4271: checking for -pthread arg to compiler" >&5
|
||||
CFLAGS_SAVE="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4267 "configure"
|
||||
#line 4275 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
pthread_create(0,0,0,0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
|
||||
# it compiles with -pthread
|
||||
@ -4286,7 +4294,7 @@ else
|
||||
# now try with -lpthread
|
||||
CFLAGS="$CFLAGS_SAVE"
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:4290: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:4298: checking for pthread_create in -lpthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4294,7 +4302,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4298 "configure"
|
||||
#line 4306 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4305,7 +4313,7 @@ int main() {
|
||||
pthread_create()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4357,7 +4365,7 @@ fi
|
||||
# Extract the first word of "gzip", so it can be a program name with args.
|
||||
set dummy gzip; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4361: checking for $ac_word" >&5
|
||||
echo "configure:4369: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4392,7 +4400,7 @@ fi
|
||||
# Extract the first word of "tar", so it can be a program name with args.
|
||||
set dummy tar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4396: checking for $ac_word" >&5
|
||||
echo "configure:4404: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
@ -700,23 +700,28 @@ AC_ARG_ENABLE(hga-dumps,
|
||||
|
||||
PRIMARY_TARGET='bochs'
|
||||
|
||||
AC_MSG_CHECKING(for external device models)
|
||||
AC_ARG_ENABLE(external-device-models,
|
||||
[ --enable-external-device-models use external hardware device models],
|
||||
[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_PROVIDE_DEVICE_MODELS, 0)
|
||||
IODEV_LIB_VAR=''
|
||||
PRIMARY_TARGET='libbochs_cpu.a'
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_PROVIDE_DEVICE_MODELS, 1)
|
||||
IODEV_LIB_VAR='iodev/libiodev.a'
|
||||
]
|
||||
)
|
||||
AC_SUBST(IODEV_LIB_VAR)
|
||||
|
||||
AC_MSG_CHECKING(for external cpu memory)
|
||||
AC_ARG_ENABLE(external-cpu-memory,
|
||||
[ --enable-external-cpu-memory use external CPU+memory simulation environment],
|
||||
[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_PROVIDE_CPU_MEMORY, 0)
|
||||
NONINLINE_VAR='$(EXTERN_ENVIRONMENT_OBJS)'
|
||||
INLINE_VAR=''
|
||||
@ -724,6 +729,7 @@ AC_ARG_ENABLE(external-cpu-memory,
|
||||
EXTERNAL_DEPENDENCY='libbochs.a: iodev/libiodev.a $(EXTERN_ENVIRONMENT_OBJS)'
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_PROVIDE_CPU_MEMORY, 1)
|
||||
NONINLINE_VAR='$(NONINLINE_OBJS)'
|
||||
]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user