mirror of https://github.com/bochs-emu/Bochs
- detect possible conflicts when running configure (SF bug #1162983):
* SSE/SSE2 need CPU level 6 * external debuggger supported on win32 only * docbook2html needed for building Docbook documentation - missing result value for 3DNow! support added - OSX sound support is used for MacOS 9, too
This commit is contained in:
Volker Ruppert
parent
3e7c8e8871
commit
a2945b42ec
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.273 2005/03/20 09:28:43 vruppert Exp .
|
||||
# From configure.in Id: configure.in,v 1.274 2005/03/21 19:15:41 vruppert Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -35075,13 +35075,21 @@ EXT_DEBUG_OBJS=''
|
|||
if test "${enable_external_debugger+set}" = set; then
|
||||
enableval="$enable_external_debugger"
|
||||
if test "$enableval" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
case $target in
|
||||
*-pc-windows* | *-cygwin* | *-mingw32*)
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_EXTERNAL_DEBUGGER 1
|
||||
_ACEOF
|
||||
|
||||
EXT_DEBUG_OBJS=extdb.o
|
||||
EXT_DEBUG_OBJS=extdb.o
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: external debugger is currently supported on win32 only"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
|
@ -35943,6 +35951,16 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_SUPPORT_3DNOW 0
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
||||
fi;
|
||||
|
||||
support_sse=0
|
||||
|
|
@ -35987,6 +36005,11 @@ echo "${ECHO_T}no" >&6
|
|||
|
||||
fi;
|
||||
|
||||
if test "$support_sse" -gt 0 -a "$bx_cpu_level" -lt 6; then
|
||||
echo "ERROR: for SSE or SSE2 support the CPU level must be set to 6"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test "$support_sse" = 2; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_SUPPORT_SSE 2
|
||||
|
|
@ -36444,7 +36467,7 @@ _ACEOF
|
|||
echo "${ECHO_T}win" >&6
|
||||
DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS -lwinmm"
|
||||
;;
|
||||
*-macosx*)
|
||||
*-macosx* | *-macos*)
|
||||
SOUNDLOW_OBJS='soundosx.o'
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_SOUND_OUTPUT_C bx_sound_osx_c
|
||||
|
|
@ -36692,6 +36715,10 @@ if test $build_docbook = 1; then
|
|||
echo "${ECHO_T}yes" >&6
|
||||
BUILD_DOCBOOK_VAR=build_docbook
|
||||
INSTALL_DOCBOOK_VAR=install_docbook
|
||||
if test "$DOCBOOK2HTML" == not_found; then
|
||||
echo "ERROR: docbook2html must be installed to build the documentation"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
|
|
|||
|
|
@ -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.273 2005-03-20 09:28:43 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.274 2005-03-21 19:15:41 vruppert Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
|
|
@ -1196,9 +1196,17 @@ EXT_DEBUG_OBJS=''
|
|||
AC_ARG_ENABLE(external-debugger,
|
||||
[ --enable-external-debugger enable external debugger support],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_EXTERNAL_DEBUGGER, 1)
|
||||
EXT_DEBUG_OBJS=extdb.o
|
||||
case $target in
|
||||
*-pc-windows* | *-cygwin* | *-mingw32*)
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_EXTERNAL_DEBUGGER, 1)
|
||||
EXT_DEBUG_OBJS=extdb.o
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: external debugger is currently supported on win32 only"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi],
|
||||
|
|
@ -1582,6 +1590,10 @@ AC_ARG_ENABLE(3dnow,
|
|||
AC_DEFINE(BX_SUPPORT_3DNOW, 0)
|
||||
fi
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_SUPPORT_3DNOW, 0)
|
||||
]
|
||||
)
|
||||
|
||||
support_sse=0
|
||||
|
|
@ -1617,6 +1629,11 @@ AC_ARG_ENABLE(sse,
|
|||
]
|
||||
)
|
||||
|
||||
if test "$support_sse" -gt 0 -a "$bx_cpu_level" -lt 6; then
|
||||
echo "ERROR: for SSE or SSE2 support the CPU level must be set to 6"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test "$support_sse" = 2; then
|
||||
AC_DEFINE(BX_SUPPORT_SSE, 2)
|
||||
elif test "$support_sse" = 1; then
|
||||
|
|
@ -1803,7 +1820,7 @@ AC_ARG_ENABLE(sb16,
|
|||
AC_MSG_RESULT(win)
|
||||
DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS -lwinmm"
|
||||
;;
|
||||
*-macosx*)
|
||||
*-macosx* | *-macos*)
|
||||
SOUNDLOW_OBJS='soundosx.o'
|
||||
AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_osx_c)
|
||||
AC_MSG_RESULT(osx)
|
||||
|
|
@ -1937,6 +1954,10 @@ if test $build_docbook = 1; then
|
|||
AC_MSG_RESULT(yes)
|
||||
BUILD_DOCBOOK_VAR=build_docbook
|
||||
INSTALL_DOCBOOK_VAR=install_docbook
|
||||
if test "$DOCBOOK2HTML" == not_found; then
|
||||
echo "ERROR: docbook2html must be installed to build the documentation"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue