regenerated after bximage fixes
This commit is contained in:
Volker Ruppert
parent
08b66534aa
commit
30a79f7ab8
83
bochs/configure
vendored
83
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 11899 2013-10-20 14:48:38Z sshwarts .
|
||||
# From configure.in Id: configure.in 11914 2013-10-28 20:31:34Z vruppert .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69.
|
||||
#
|
||||
@ -808,8 +808,6 @@ CFP
|
||||
CXXFP
|
||||
SLASH
|
||||
DASH
|
||||
BXIMAGE_FLAG
|
||||
BXIMAGE_LINK_OPTS
|
||||
GUI_LINK_OPTS_WX
|
||||
GUI_LINK_OPTS_TERM
|
||||
GUI_LINK_OPTS
|
||||
@ -825,6 +823,9 @@ PTHREAD_CC
|
||||
EXPORT_DYNAMIC
|
||||
DIALOG_OBJS
|
||||
ENH_DBG_OBJS
|
||||
CXXFLAGS_CONSOLE
|
||||
BXIMAGE_LINK_OPTS
|
||||
BXIMAGE_FLAG
|
||||
WGET
|
||||
TOOLKIT_CXXFLAGS
|
||||
WX_CXXFLAGS
|
||||
@ -5157,7 +5158,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5160 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5161 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -6845,11 +6846,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:6848: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6849: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6852: \$? = $ac_status" >&5
|
||||
echo "$as_me:6853: \$? = $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
|
||||
@ -7078,11 +7079,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:7081: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7082: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7085: \$? = $ac_status" >&5
|
||||
echo "$as_me:7086: \$? = $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
|
||||
@ -7145,11 +7146,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:7148: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7149: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7152: \$? = $ac_status" >&5
|
||||
echo "$as_me:7153: \$? = $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
|
||||
@ -8935,7 +8936,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8938 "configure"
|
||||
#line 8939 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -9033,7 +9034,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9036 "configure"
|
||||
#line 9037 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11148,11 +11149,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:11151: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11152: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11155: \$? = $ac_status" >&5
|
||||
echo "$as_me:11156: \$? = $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
|
||||
@ -11215,11 +11216,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:11218: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11219: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11222: \$? = $ac_status" >&5
|
||||
echo "$as_me:11223: \$? = $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
|
||||
@ -12240,7 +12241,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12243 "configure"
|
||||
#line 12244 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12338,7 +12339,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12341 "configure"
|
||||
#line 12342 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13161,11 +13162,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:13164: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13165: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13168: \$? = $ac_status" >&5
|
||||
echo "$as_me:13169: \$? = $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
|
||||
@ -13228,11 +13229,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:13231: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13232: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13235: \$? = $ac_status" >&5
|
||||
echo "$as_me:13236: \$? = $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
|
||||
@ -15193,11 +15194,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:15196: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15197: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15200: \$? = $ac_status" >&5
|
||||
echo "$as_me:15201: \$? = $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
|
||||
@ -15426,11 +15427,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:15429: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15430: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15433: \$? = $ac_status" >&5
|
||||
echo "$as_me:15434: \$? = $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
|
||||
@ -15493,11 +15494,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:15496: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15497: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15500: \$? = $ac_status" >&5
|
||||
echo "$as_me:15501: \$? = $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
|
||||
@ -17283,7 +17284,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17286 "configure"
|
||||
#line 17287 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17381,7 +17382,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17384 "configure"
|
||||
#line 17385 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19068,7 +19069,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19071 "configure"
|
||||
#line 19072 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -24615,8 +24616,6 @@ fi
|
||||
# everybody has to re-invent the wheel. differently.
|
||||
test "${WGET}" = "curl" && WGET="curl -O"
|
||||
|
||||
BXIMAGE_FLAG="-DBXIMAGE"
|
||||
|
||||
# modify settings based on target platform
|
||||
case "$target" in
|
||||
*-macosx*)
|
||||
@ -24671,7 +24670,6 @@ case "$target" in
|
||||
EXE=".exe"
|
||||
PRIMARY_TARGET="bochs.exe"
|
||||
BXIMAGE_LINK_OPTS="user32.lib"
|
||||
BXIMAGE_FLAG="/DBXIMAGE"
|
||||
# also compile niclist if networking is on
|
||||
if test "$networking" = yes; then
|
||||
PRIMARY_TARGET="$PRIMARY_TARGET niclist.exe"
|
||||
@ -24717,6 +24715,21 @@ case "$target" in
|
||||
;;
|
||||
esac
|
||||
|
||||
# bximage specific settings
|
||||
case "$target" in
|
||||
*-pc-windows*)
|
||||
BXIMAGE_FLAG="/DBXIMAGE"
|
||||
CXXFLAGS_CONSOLE="/nologo /MT /W3 /EHs-c- /DNDEBUG /DWIN32 /D_WINDOWS /D_CRT_SECURE_NO_WARNINGS $C_OPT"
|
||||
;;
|
||||
*)
|
||||
BXIMAGE_FLAG="-DBXIMAGE"
|
||||
CXXFLAGS_CONSOLE="$CXXFLAGS"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
ENH_DBG_OBJS=""
|
||||
if test "$gui_debugger" = 1; then
|
||||
if test "$needs_gtk2" = 1; then
|
||||
@ -25521,8 +25534,6 @@ if test ! -d build/win32/nsis; then mkdir build/win32/nsis; fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user