- in 1.173 I accidently checked in some pieces of the svgalib patch along
with the nsis installer stuff. This reverts the svgalib part. When we check in the svgalib patch, I want to do it all in one piece.
This commit is contained in:
Bryce Denney
parent
a648fc5a63
commit
4098c5bed8
258
bochs/configure
vendored
258
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.173 2002/11/21 03:43:03 bdenney Exp .
|
||||
# From configure.in Id: configure.in,v 1.174 2002/11/21 03:50:59 bdenney Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.53.
|
||||
#
|
||||
@ -1066,7 +1066,6 @@ Optional Packages:
|
||||
--with-rfb use RFB protocol, works with VNC viewer
|
||||
--with-amigaos use MorphOS (Amiga)
|
||||
--with-sdl use SDL libraries
|
||||
--with-svga use SVGALib libraries
|
||||
--with-wx use wxWindows libraries
|
||||
--with-all-libs compile all guis that Bochs supports
|
||||
|
||||
@ -1619,7 +1618,6 @@ echo "$as_me:$LINENO: result: $ADD_FLAGS" >&5
|
||||
echo "${ECHO_T}$ADD_FLAGS" >&6
|
||||
|
||||
if (test "$with_sdl" != yes) && \
|
||||
(test "$with_svga" != yes) && \
|
||||
(test "$with_x11" != yes) && \
|
||||
(test "$with_beos" != yes) && \
|
||||
(test "$with_win32" != yes) && \
|
||||
@ -4204,7 +4202,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
||||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4207 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4205 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4754,7 +4752,7 @@ chmod -w .
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
|
||||
compiler_c_o=no
|
||||
if { (eval echo configure:4757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
if { (eval echo configure:4755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
@ -6585,7 +6583,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6588 "configure"
|
||||
#line 6586 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -6683,7 +6681,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6686 "configure"
|
||||
#line 6684 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8725,7 +8723,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8728 "configure"
|
||||
#line 8726 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -16492,229 +16490,6 @@ fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_svga" != yes; then
|
||||
can_compile_svga=1
|
||||
if test "${ac_cv_header_vga_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for vga.h" >&5
|
||||
echo $ECHO_N "checking for vga.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header_vga_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_header_vga_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_vga_h" >&6
|
||||
else
|
||||
# Is the header compilable?
|
||||
echo "$as_me:$LINENO: checking vga.h usability" >&5
|
||||
echo $ECHO_N "checking vga.h usability... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
$ac_includes_default
|
||||
#include <vga.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6
|
||||
|
||||
# Is the header present?
|
||||
echo "$as_me:$LINENO: checking vga.h presence" >&5
|
||||
echo $ECHO_N "checking vga.h presence... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
#include <vga.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
ac_status=$?
|
||||
egrep -v '^ *\+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null; then
|
||||
if test -s conftest.err; then
|
||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||
else
|
||||
ac_cpp_err=
|
||||
fi
|
||||
else
|
||||
ac_cpp_err=yes
|
||||
fi
|
||||
if test -z "$ac_cpp_err"; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc in
|
||||
yes:no )
|
||||
{ echo "$as_me:$LINENO: WARNING: vga.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: vga.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: vga.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: vga.h: proceeding with the preprocessor's result" >&2;};;
|
||||
no:yes )
|
||||
{ echo "$as_me:$LINENO: WARNING: vga.h: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: vga.h: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: vga.h: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: vga.h: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: vga.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: vga.h: proceeding with the preprocessor's result" >&2;};;
|
||||
esac
|
||||
echo "$as_me:$LINENO: checking for vga.h" >&5
|
||||
echo $ECHO_N "checking for vga.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header_vga_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_header_vga_h=$ac_header_preproc
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_header_vga_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_vga_h" >&6
|
||||
|
||||
fi
|
||||
if test $ac_cv_header_vga_h = yes; then
|
||||
:
|
||||
else
|
||||
can_compile_svga=0
|
||||
fi
|
||||
|
||||
|
||||
if test "${ac_cv_header_vgagl_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for vgagl.h" >&5
|
||||
echo $ECHO_N "checking for vgagl.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header_vgagl_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_header_vgagl_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_vgagl_h" >&6
|
||||
else
|
||||
# Is the header compilable?
|
||||
echo "$as_me:$LINENO: checking vgagl.h usability" >&5
|
||||
echo $ECHO_N "checking vgagl.h usability... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
$ac_includes_default
|
||||
#include <vgagl.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6
|
||||
|
||||
# Is the header present?
|
||||
echo "$as_me:$LINENO: checking vgagl.h presence" >&5
|
||||
echo $ECHO_N "checking vgagl.h presence... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
#include <vgagl.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
ac_status=$?
|
||||
egrep -v '^ *\+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null; then
|
||||
if test -s conftest.err; then
|
||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||
else
|
||||
ac_cpp_err=
|
||||
fi
|
||||
else
|
||||
ac_cpp_err=yes
|
||||
fi
|
||||
if test -z "$ac_cpp_err"; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc in
|
||||
yes:no )
|
||||
{ echo "$as_me:$LINENO: WARNING: vgagl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: vgagl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: vgagl.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: vgagl.h: proceeding with the preprocessor's result" >&2;};;
|
||||
no:yes )
|
||||
{ echo "$as_me:$LINENO: WARNING: vgagl.h: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: vgagl.h: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: vgagl.h: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: vgagl.h: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: vgagl.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: vgagl.h: proceeding with the preprocessor's result" >&2;};;
|
||||
esac
|
||||
echo "$as_me:$LINENO: checking for vgagl.h" >&5
|
||||
echo $ECHO_N "checking for vgagl.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header_vgagl_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_header_vgagl_h=$ac_header_preproc
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_header_vgagl_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_vgagl_h" >&6
|
||||
|
||||
fi
|
||||
if test $ac_cv_header_vgagl_h = yes; then
|
||||
:
|
||||
else
|
||||
can_compile_svga=0
|
||||
fi
|
||||
|
||||
|
||||
if test $can_compile_svga = 1; then
|
||||
with_svga=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_x11" != yes; then
|
||||
can_compile_x11=1
|
||||
if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
|
||||
@ -20625,13 +20400,6 @@ if test "${with_sdl+set}" = set; then
|
||||
fi;
|
||||
|
||||
|
||||
# Check whether --with-svga or --without-svga was given.
|
||||
if test "${with_svga+set}" = set; then
|
||||
withval="$with_svga"
|
||||
|
||||
fi;
|
||||
|
||||
|
||||
# Check whether --with-wx or --without-wx was given.
|
||||
if test "${with_wx+set}" = set; then
|
||||
withval="$with_wx"
|
||||
@ -20792,20 +20560,6 @@ _ACEOF
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
|
||||
fi
|
||||
|
||||
if test "$with_svga" = yes; then
|
||||
display_libs="$display_libs svga"
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_WITH_SVGA 1
|
||||
_ACEOF
|
||||
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SVGA)"
|
||||
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
||||
# the files in gui/*.cc.
|
||||
GUI_CFLAGS="$GUI_CFLAGS"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SVGA)"
|
||||
fi
|
||||
|
||||
if test "$with_rfb" = yes; then
|
||||
display_libs="$display_libs rfb"
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
|
||||
@ -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.174 2002-11-21 03:50:59 bdenney Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.175 2002-11-21 17:40:14 bdenney Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -84,7 +84,6 @@ AC_MSG_RESULT($ADD_FLAGS)
|
||||
|
||||
dnl // make sure X Windows is default if no other chosen
|
||||
if (test "$with_sdl" != yes) && \
|
||||
(test "$with_svga" != yes) && \
|
||||
(test "$with_x11" != yes) && \
|
||||
(test "$with_beos" != yes) && \
|
||||
(test "$with_win32" != yes) && \
|
||||
@ -270,15 +269,6 @@ if test "$with_all_libs" = yes; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_svga" != yes; then
|
||||
can_compile_svga=1
|
||||
AC_CHECK_HEADER([vga.h], [], [ can_compile_svga=0 ])
|
||||
AC_CHECK_HEADER([vgagl.h], [], [ can_compile_svga=0 ])
|
||||
if test $can_compile_svga = 1; then
|
||||
with_svga=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_x11" != yes; then
|
||||
can_compile_x11=1
|
||||
AC_CHECK_HEADER([X11/Xlib.h], [], [ can_compile_x11=0 ])
|
||||
@ -1558,10 +1548,6 @@ AC_ARG_WITH(sdl,
|
||||
[ --with-sdl use SDL libraries],
|
||||
)
|
||||
|
||||
AC_ARG_WITH(svga,
|
||||
[ --with-svga use SVGALib libraries],
|
||||
)
|
||||
|
||||
AC_ARG_WITH(wx,
|
||||
[ --with-wx use wxWindows libraries],
|
||||
)
|
||||
@ -1674,17 +1660,6 @@ if test "$with_sdl" = yes; then
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
|
||||
fi
|
||||
|
||||
if test "$with_svga" = yes; then
|
||||
display_libs="$display_libs svga"
|
||||
AC_DEFINE(BX_WITH_SVGA, 1)
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SVGA)"
|
||||
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
||||
# the files in gui/*.cc.
|
||||
GUI_CFLAGS="$GUI_CFLAGS"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SVGA)"
|
||||
fi
|
||||
|
||||
if test "$with_rfb" = yes; then
|
||||
display_libs="$display_libs rfb"
|
||||
AC_DEFINE(BX_WITH_RFB, 1)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user