regenerated after adding 'vncsrv' gui
This commit is contained in:
Volker Ruppert
parent
17b7b87a61
commit
5618cea18b
113
bochs/configure
vendored
113
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 11696 2013-05-29 17:35:19Z vruppert .
|
||||
# From configure.in Id: configure.in 11699 2013-05-30 17:18:30Z vruppert .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68.
|
||||
#
|
||||
@ -794,6 +794,7 @@ GUI_LINK_OPTS_TERM
|
||||
GUI_LINK_OPTS
|
||||
DEVICE_LINK_OPTS
|
||||
GUI_OBJS
|
||||
VNCSRV_LIBS
|
||||
RFB_LIBS
|
||||
INSTALL_LIST_FOR_PLATFORM
|
||||
INSTALL_TARGET
|
||||
@ -1013,6 +1014,7 @@ with_carbon
|
||||
with_nogui
|
||||
with_term
|
||||
with_rfb
|
||||
with_vncsrv
|
||||
with_amigaos
|
||||
with_sdl
|
||||
with_svga
|
||||
@ -1750,6 +1752,7 @@ Optional Packages:
|
||||
--with-nogui no native GUI, just use blank stubs
|
||||
--with-term textmode terminal environment
|
||||
--with-rfb use RFB protocol, works with VNC viewer
|
||||
--with-vncsrv use LibVNCServer, works with VNC viewer
|
||||
--with-amigaos use AmigaOS (or MorphOS) GUI
|
||||
--with-sdl use SDL libraries
|
||||
--with-svga use SVGALib libraries
|
||||
@ -3350,6 +3353,7 @@ if (test "$with_sdl" != yes) && \
|
||||
(test "$with_nogui" != yes) && \
|
||||
(test "$with_term" != yes) && \
|
||||
(test "$with_rfb" != yes) && \
|
||||
(test "$with_vncsrv" != yes) && \
|
||||
(test "$with_amigaos" != yes) && \
|
||||
(test "$with_carbon" != yes) && \
|
||||
(test "$with_wx" != yes) && \
|
||||
@ -5127,7 +5131,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5130 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5134 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -6815,11 +6819,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:6818: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6822: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6822: \$? = $ac_status" >&5
|
||||
echo "$as_me:6826: \$? = $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
|
||||
@ -7048,11 +7052,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:7051: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7055: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7055: \$? = $ac_status" >&5
|
||||
echo "$as_me:7059: \$? = $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
|
||||
@ -7115,11 +7119,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:7118: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7122: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7122: \$? = $ac_status" >&5
|
||||
echo "$as_me:7126: \$? = $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
|
||||
@ -8905,7 +8909,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8908 "configure"
|
||||
#line 8912 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -9003,7 +9007,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9006 "configure"
|
||||
#line 9010 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11118,11 +11122,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:11121: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11125: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11125: \$? = $ac_status" >&5
|
||||
echo "$as_me:11129: \$? = $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
|
||||
@ -11185,11 +11189,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:11188: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11192: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11192: \$? = $ac_status" >&5
|
||||
echo "$as_me:11196: \$? = $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
|
||||
@ -12210,7 +12214,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12213 "configure"
|
||||
#line 12217 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12308,7 +12312,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12311 "configure"
|
||||
#line 12315 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13131,11 +13135,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:13134: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13138: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13138: \$? = $ac_status" >&5
|
||||
echo "$as_me:13142: \$? = $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
|
||||
@ -13198,11 +13202,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:13201: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13205: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13205: \$? = $ac_status" >&5
|
||||
echo "$as_me:13209: \$? = $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
|
||||
@ -15163,11 +15167,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:15166: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15170: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15170: \$? = $ac_status" >&5
|
||||
echo "$as_me:15174: \$? = $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
|
||||
@ -15396,11 +15400,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:15399: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15403: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15403: \$? = $ac_status" >&5
|
||||
echo "$as_me:15407: \$? = $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
|
||||
@ -15463,11 +15467,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:15466: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15470: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15470: \$? = $ac_status" >&5
|
||||
echo "$as_me:15474: \$? = $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
|
||||
@ -17253,7 +17257,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17256 "configure"
|
||||
#line 17260 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17351,7 +17355,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17354 "configure"
|
||||
#line 17358 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19037,7 +19041,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19040 "configure"
|
||||
#line 19044 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -21544,6 +21548,36 @@ fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_vncsrv" != yes; then
|
||||
can_compile_vncsrv=1
|
||||
case $target in
|
||||
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-mingw32*)
|
||||
can_compile_vncsrv=0
|
||||
;;
|
||||
*)
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "rfb/rfb.h" "ac_cv_header_rfb_rfb_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_rfb_rfb_h" = xyes; then :
|
||||
|
||||
else
|
||||
can_compile_vncsrv=0
|
||||
fi
|
||||
|
||||
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_pthread_h" = xyes; then :
|
||||
|
||||
else
|
||||
can_compile_vncsrv=0
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
esac
|
||||
if test $can_compile_vncsrv = 1; then
|
||||
with_vncsrv=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_term" != yes; then
|
||||
can_compile_term=1
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
|
||||
@ -23994,6 +24028,13 @@ fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-vncsrv was given.
|
||||
if test "${with_vncsrv+set}" = set; then :
|
||||
withval=$with_vncsrv;
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-amigaos was given.
|
||||
if test "${with_amigaos+set}" = set; then :
|
||||
withval=$with_amigaos;
|
||||
@ -24271,6 +24312,14 @@ if test "$with_rfb" = yes; then
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_RFB)"
|
||||
fi
|
||||
|
||||
if test "$with_vncsrv" = yes; then
|
||||
display_libs="$display_libs vncsrv"
|
||||
$as_echo "#define BX_WITH_VNCSRV 1" >>confdefs.h
|
||||
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_VNCSRV)"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_VNCSRV)"
|
||||
fi
|
||||
|
||||
if test "$with_amigaos" = yes; then
|
||||
display_libs="$display_libs amigaos"
|
||||
$as_echo "#define BX_WITH_AMIGAOS 1" >>confdefs.h
|
||||
@ -25302,11 +25351,14 @@ fi
|
||||
# since some features need the pthread library, check that it was found.
|
||||
# But on win32 platforms, the pthread library is not needed.
|
||||
if test "$cross_configure" = 0; then
|
||||
if test "$with_rfb" = yes -o "$soundcard_present" = 1; then
|
||||
if test "$with_rfb" = yes -o "$with_vncsrv" = yes -o "$soundcard_present" = 1; then
|
||||
if test "$pthread_ok" = yes; then
|
||||
if test "$with_rfb" = yes; then
|
||||
RFB_LIBS="$RFB_LIBS $PTHREAD_LIBS"
|
||||
fi
|
||||
if test "$with_vncsrv" = yes; then
|
||||
VNCSRV_LIBS="$VNCSRV_LIBS $PTHREAD_LIBS"
|
||||
fi
|
||||
if test "$soundcard_present" = 1; then
|
||||
if test "$bx_plugins" = 1; then
|
||||
SOUND_LINK_OPTS="$SOUND_LINK_OPTS $PTHREAD_LIBS"
|
||||
@ -25408,6 +25460,7 @@ if test ! -d build/win32/nsis; then mkdir build/win32/nsis; fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Extract the first word of "gzip", so it can be a program name with args.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user