- add --subsystem,windows -mwindows to link line for win32 compile with
wxwindows
This commit is contained in:
Bryce Denney
parent
e377b6dd5d
commit
2f502adc45
207
bochs/configure
vendored
207
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.141 2002/10/01 23:37:50 bdenney Exp .
|
||||
# From configure.in Id: configure.in,v 1.142 2002/10/02 00:09:49 bdenney Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by Autoconf 2.52.
|
||||
#
|
||||
@ -9214,10 +9214,11 @@ EOF
|
||||
case $target in
|
||||
*-pc-windows* | *-cygwin* | *-mingw32*)
|
||||
EXTRA_BX_OBJS="$EXTRA_BX_OBJS wxbochs_resources.o"
|
||||
GUI_LINK_OPTS_WX="$GUI_LINK_OPTS_WX --subsystem,windows -mwindows"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
echo "$as_me:9220: result: none" >&5
|
||||
echo "$as_me:9221: result: none" >&5
|
||||
echo "${ECHO_T}none" >&6
|
||||
cat >>confdefs.h <<\EOF
|
||||
#define BX_WITH_NOGUI 1
|
||||
@ -9305,7 +9306,7 @@ EOF
|
||||
esac
|
||||
|
||||
if test "$use_curses" = yes -a "$cross_configure" = 0; then
|
||||
echo "$as_me:9308: checking for mvaddch in -lcurses" >&5
|
||||
echo "$as_me:9309: checking for mvaddch in -lcurses" >&5
|
||||
echo $ECHO_N "checking for mvaddch in -lcurses... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_curses_mvaddch+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -9313,7 +9314,7 @@ else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lcurses $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9316 "configure"
|
||||
#line 9317 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
@ -9332,16 +9333,16 @@ mvaddch ();
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9335: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9338: \$? = $ac_status" >&5
|
||||
echo "$as_me:9339: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9341: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9342: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9344: \$? = $ac_status" >&5
|
||||
echo "$as_me:9345: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_curses_mvaddch=yes
|
||||
else
|
||||
@ -9352,13 +9353,13 @@ fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:9355: result: $ac_cv_lib_curses_mvaddch" >&5
|
||||
echo "$as_me:9356: result: $ac_cv_lib_curses_mvaddch" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_curses_mvaddch" >&6
|
||||
if test $ac_cv_lib_curses_mvaddch = yes; then
|
||||
GUI_LINK_OPTS_TERM='-lcurses'
|
||||
fi
|
||||
|
||||
echo "$as_me:9361: checking for mvaddch in -lncurses" >&5
|
||||
echo "$as_me:9362: checking for mvaddch in -lncurses" >&5
|
||||
echo $ECHO_N "checking for mvaddch in -lncurses... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_ncurses_mvaddch+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -9366,7 +9367,7 @@ else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lncurses $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9369 "configure"
|
||||
#line 9370 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
@ -9385,16 +9386,16 @@ mvaddch ();
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9388: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9389: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9391: \$? = $ac_status" >&5
|
||||
echo "$as_me:9392: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9394: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9395: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9397: \$? = $ac_status" >&5
|
||||
echo "$as_me:9398: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_ncurses_mvaddch=yes
|
||||
else
|
||||
@ -9405,13 +9406,13 @@ fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:9408: result: $ac_cv_lib_ncurses_mvaddch" >&5
|
||||
echo "$as_me:9409: result: $ac_cv_lib_ncurses_mvaddch" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_ncurses_mvaddch" >&6
|
||||
if test $ac_cv_lib_ncurses_mvaddch = yes; then
|
||||
GUI_LINK_OPTS_TERM='-lncurses'
|
||||
fi
|
||||
|
||||
echo "$as_me:9414: checking for mvaddch in -ltermlib" >&5
|
||||
echo "$as_me:9415: checking for mvaddch in -ltermlib" >&5
|
||||
echo $ECHO_N "checking for mvaddch in -ltermlib... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_termlib_mvaddch+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -9419,7 +9420,7 @@ else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ltermlib $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9422 "configure"
|
||||
#line 9423 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
@ -9438,16 +9439,16 @@ mvaddch ();
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9442: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9444: \$? = $ac_status" >&5
|
||||
echo "$as_me:9445: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9447: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9448: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9450: \$? = $ac_status" >&5
|
||||
echo "$as_me:9451: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_termlib_mvaddch=yes
|
||||
else
|
||||
@ -9458,7 +9459,7 @@ fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:9461: result: $ac_cv_lib_termlib_mvaddch" >&5
|
||||
echo "$as_me:9462: result: $ac_cv_lib_termlib_mvaddch" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_termlib_mvaddch" >&6
|
||||
if test $ac_cv_lib_termlib_mvaddch = yes; then
|
||||
GUI_LINK_OPTS_TERM='-ltermlib'
|
||||
@ -9477,13 +9478,13 @@ if test "$with_term" = yes; then
|
||||
for ac_func in color_set
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:9480: checking for $ac_func" >&5
|
||||
echo "$as_me:9481: checking for $ac_func" >&5
|
||||
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9486 "configure"
|
||||
#line 9487 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func (); below. */
|
||||
@ -9514,16 +9515,16 @@ f = $ac_func;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9517: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9518: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9520: \$? = $ac_status" >&5
|
||||
echo "$as_me:9521: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9523: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9524: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9526: \$? = $ac_status" >&5
|
||||
echo "$as_me:9527: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_var=yes"
|
||||
else
|
||||
@ -9533,7 +9534,7 @@ eval "$as_ac_var=no"
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:9536: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "$as_me:9537: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<EOF
|
||||
@ -9555,13 +9556,13 @@ if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
||||
for ac_func in socket
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:9558: checking for $ac_func" >&5
|
||||
echo "$as_me:9559: checking for $ac_func" >&5
|
||||
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9564 "configure"
|
||||
#line 9565 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func (); below. */
|
||||
@ -9592,16 +9593,16 @@ f = $ac_func;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9595: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9596: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9598: \$? = $ac_status" >&5
|
||||
echo "$as_me:9599: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9601: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9602: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9604: \$? = $ac_status" >&5
|
||||
echo "$as_me:9605: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_var=yes"
|
||||
else
|
||||
@ -9611,7 +9612,7 @@ eval "$as_ac_var=no"
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:9614: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "$as_me:9615: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<EOF
|
||||
@ -9622,7 +9623,7 @@ fi
|
||||
done
|
||||
|
||||
if test "$have_socket" != yes; then
|
||||
echo "$as_me:9625: checking for socket in -lsocket" >&5
|
||||
echo "$as_me:9626: checking for socket in -lsocket" >&5
|
||||
echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_socket_socket+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -9630,7 +9631,7 @@ else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9633 "configure"
|
||||
#line 9634 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
@ -9649,16 +9650,16 @@ socket ();
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9652: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9653: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9655: \$? = $ac_status" >&5
|
||||
echo "$as_me:9656: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9658: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9659: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9661: \$? = $ac_status" >&5
|
||||
echo "$as_me:9662: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_socket_socket=yes
|
||||
else
|
||||
@ -9669,7 +9670,7 @@ fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:9672: result: $ac_cv_lib_socket_socket" >&5
|
||||
echo "$as_me:9673: result: $ac_cv_lib_socket_socket" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
|
||||
if test $ac_cv_lib_socket_socket = yes; then
|
||||
RFB_LIBS="$RFB_LIBS -lsocket"
|
||||
@ -9694,23 +9695,23 @@ acx_pthread_ok=no
|
||||
|
||||
# First, check if the POSIX threads header, pthread.h, is available.
|
||||
# If it isn't, don't bother looking for the threads libraries.
|
||||
echo "$as_me:9697: checking for pthread.h" >&5
|
||||
echo "$as_me:9698: checking for pthread.h" >&5
|
||||
echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header_pthread_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9703 "configure"
|
||||
#line 9704 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:9707: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
if { (eval echo "$as_me:9708: \"$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:9713: \$? = $ac_status" >&5
|
||||
echo "$as_me:9714: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null; then
|
||||
if test -s conftest.err; then
|
||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||
@ -9729,7 +9730,7 @@ else
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:9732: result: $ac_cv_header_pthread_h" >&5
|
||||
echo "$as_me:9733: result: $ac_cv_header_pthread_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
|
||||
if test $ac_cv_header_pthread_h = yes; then
|
||||
:
|
||||
@ -9751,10 +9752,10 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
|
||||
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
echo "$as_me:9754: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
|
||||
echo "$as_me:9755: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
|
||||
echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9757 "configure"
|
||||
#line 9758 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
@ -9773,16 +9774,16 @@ pthread_join ();
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9776: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9777: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9779: \$? = $ac_status" >&5
|
||||
echo "$as_me:9780: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9782: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9783: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9785: \$? = $ac_status" >&5
|
||||
echo "$as_me:9786: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
acx_pthread_ok=yes
|
||||
else
|
||||
@ -9790,7 +9791,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
echo "$as_me:9793: result: $acx_pthread_ok" >&5
|
||||
echo "$as_me:9794: result: $acx_pthread_ok" >&5
|
||||
echo "${ECHO_T}$acx_pthread_ok" >&6
|
||||
if test x"$acx_pthread_ok" = xno; then
|
||||
PTHREAD_LIBS=""
|
||||
@ -9844,18 +9845,18 @@ for flag in $acx_pthread_flags; do
|
||||
|
||||
case $flag in
|
||||
none)
|
||||
echo "$as_me:9847: checking whether pthreads work without any flags" >&5
|
||||
echo "$as_me:9848: checking whether pthreads work without any flags" >&5
|
||||
echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
|
||||
;;
|
||||
|
||||
-*)
|
||||
echo "$as_me:9852: checking whether pthreads work with $flag" >&5
|
||||
echo "$as_me:9853: checking whether pthreads work with $flag" >&5
|
||||
echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
|
||||
PTHREAD_CFLAGS="$flag"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "$as_me:9858: checking for the pthreads library -l$flag" >&5
|
||||
echo "$as_me:9859: checking for the pthreads library -l$flag" >&5
|
||||
echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6
|
||||
PTHREAD_LIBS="-l$flag"
|
||||
;;
|
||||
@ -9876,7 +9877,7 @@ echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6
|
||||
# functions on Solaris that doesn't have a non-functional libc stub.
|
||||
# We try pthread_create on general principles.
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9879 "configure"
|
||||
#line 9880 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int
|
||||
@ -9890,16 +9891,16 @@ pthread_t th; pthread_join(th, 0);
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9893: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9894: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9896: \$? = $ac_status" >&5
|
||||
echo "$as_me:9897: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9899: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9900: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9902: \$? = $ac_status" >&5
|
||||
echo "$as_me:9903: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
acx_pthread_ok=yes
|
||||
else
|
||||
@ -9911,7 +9912,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
echo "$as_me:9914: result: $acx_pthread_ok" >&5
|
||||
echo "$as_me:9915: result: $acx_pthread_ok" >&5
|
||||
echo "${ECHO_T}$acx_pthread_ok" >&6
|
||||
if test "x$acx_pthread_ok" = xyes; then
|
||||
break;
|
||||
@ -9931,10 +9932,10 @@ if test "x$acx_pthread_ok" = xyes; then
|
||||
|
||||
# Detect AIX lossage: threads are created detached by default
|
||||
# and the JOINABLE attribute has a nonstandard name (UNDETACHED).
|
||||
echo "$as_me:9934: checking for joinable pthread attribute" >&5
|
||||
echo "$as_me:9935: checking for joinable pthread attribute" >&5
|
||||
echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9937 "configure"
|
||||
#line 9938 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int
|
||||
@ -9946,16 +9947,16 @@ int attr=PTHREAD_CREATE_JOINABLE;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9949: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9950: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9952: \$? = $ac_status" >&5
|
||||
echo "$as_me:9953: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9955: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9956: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9958: \$? = $ac_status" >&5
|
||||
echo "$as_me:9959: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ok=PTHREAD_CREATE_JOINABLE
|
||||
else
|
||||
@ -9966,7 +9967,7 @@ fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
if test x"$ok" = xunknown; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 9969 "configure"
|
||||
#line 9970 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int
|
||||
@ -9978,16 +9979,16 @@ int attr=PTHREAD_CREATE_UNDETACHED;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9984: \$? = $ac_status" >&5
|
||||
echo "$as_me:9985: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:9987: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:9988: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:9990: \$? = $ac_status" >&5
|
||||
echo "$as_me:9991: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ok=PTHREAD_CREATE_UNDETACHED
|
||||
else
|
||||
@ -10004,21 +10005,21 @@ cat >>confdefs.h <<\EOF
|
||||
EOF
|
||||
|
||||
fi
|
||||
echo "$as_me:10007: result: ${ok}" >&5
|
||||
echo "$as_me:10008: result: ${ok}" >&5
|
||||
echo "${ECHO_T}${ok}" >&6
|
||||
if test x"$ok" = xunknown; then
|
||||
{ echo "$as_me:10010: WARNING: we do not know how to create joinable pthreads" >&5
|
||||
{ echo "$as_me:10011: WARNING: we do not know how to create joinable pthreads" >&5
|
||||
echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;}
|
||||
fi
|
||||
|
||||
echo "$as_me:10014: checking if more special flags are required for pthreads" >&5
|
||||
echo "$as_me:10015: checking if more special flags are required for pthreads" >&5
|
||||
echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6
|
||||
flag=no
|
||||
case "${host_cpu}-${host_os}" in
|
||||
*-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
|
||||
*solaris* | alpha*-osf*) flag="-D_REENTRANT";;
|
||||
esac
|
||||
echo "$as_me:10021: result: ${flag}" >&5
|
||||
echo "$as_me:10022: result: ${flag}" >&5
|
||||
echo "${ECHO_T}${flag}" >&6
|
||||
if test "x$flag" != xno; then
|
||||
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
|
||||
@ -10030,7 +10031,7 @@ echo "${ECHO_T}${flag}" >&6
|
||||
# More AIX lossage: must compile with cc_r
|
||||
# Extract the first word of "cc_r", so it can be a program name with args.
|
||||
set dummy cc_r; ac_word=$2
|
||||
echo "$as_me:10033: checking for $ac_word" >&5
|
||||
echo "$as_me:10034: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -10045,7 +10046,7 @@ for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
$as_executable_p "$ac_dir/$ac_word" || continue
|
||||
ac_cv_prog_PTHREAD_CC="cc_r"
|
||||
echo "$as_me:10048: found $ac_dir/$ac_word" >&5
|
||||
echo "$as_me:10049: found $ac_dir/$ac_word" >&5
|
||||
break
|
||||
done
|
||||
|
||||
@ -10054,10 +10055,10 @@ fi
|
||||
fi
|
||||
PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
|
||||
if test -n "$PTHREAD_CC"; then
|
||||
echo "$as_me:10057: result: $PTHREAD_CC" >&5
|
||||
echo "$as_me:10058: result: $PTHREAD_CC" >&5
|
||||
echo "${ECHO_T}$PTHREAD_CC" >&6
|
||||
else
|
||||
echo "$as_me:10060: result: no" >&5
|
||||
echo "$as_me:10061: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
@ -10106,7 +10107,7 @@ if test ! -d build/linux; then mkdir build/linux; fi
|
||||
|
||||
# Extract the first word of "gzip", so it can be a program name with args.
|
||||
set dummy gzip; ac_word=$2
|
||||
echo "$as_me:10109: checking for $ac_word" >&5
|
||||
echo "$as_me:10110: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_GZIP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -10123,7 +10124,7 @@ for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if $as_executable_p "$ac_dir/$ac_word"; then
|
||||
ac_cv_path_GZIP="$ac_dir/$ac_word"
|
||||
echo "$as_me:10126: found $ac_dir/$ac_word" >&5
|
||||
echo "$as_me:10127: found $ac_dir/$ac_word" >&5
|
||||
break
|
||||
fi
|
||||
done
|
||||
@ -10134,16 +10135,16 @@ fi
|
||||
GZIP=$ac_cv_path_GZIP
|
||||
|
||||
if test -n "$GZIP"; then
|
||||
echo "$as_me:10137: result: $GZIP" >&5
|
||||
echo "$as_me:10138: result: $GZIP" >&5
|
||||
echo "${ECHO_T}$GZIP" >&6
|
||||
else
|
||||
echo "$as_me:10140: result: no" >&5
|
||||
echo "$as_me:10141: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
# Extract the first word of "tar", so it can be a program name with args.
|
||||
set dummy tar; ac_word=$2
|
||||
echo "$as_me:10146: checking for $ac_word" >&5
|
||||
echo "$as_me:10147: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_TAR+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -10160,7 +10161,7 @@ for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if $as_executable_p "$ac_dir/$ac_word"; then
|
||||
ac_cv_path_TAR="$ac_dir/$ac_word"
|
||||
echo "$as_me:10163: found $ac_dir/$ac_word" >&5
|
||||
echo "$as_me:10164: found $ac_dir/$ac_word" >&5
|
||||
break
|
||||
fi
|
||||
done
|
||||
@ -10171,10 +10172,10 @@ fi
|
||||
TAR=$ac_cv_path_TAR
|
||||
|
||||
if test -n "$TAR"; then
|
||||
echo "$as_me:10174: result: $TAR" >&5
|
||||
echo "$as_me:10175: result: $TAR" >&5
|
||||
echo "${ECHO_T}$TAR" >&6
|
||||
else
|
||||
echo "$as_me:10177: result: no" >&5
|
||||
echo "$as_me:10178: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
@ -10258,7 +10259,7 @@ DEFS=-DHAVE_CONFIG_H
|
||||
: ${CONFIG_STATUS=./config.status}
|
||||
ac_clean_files_save=$ac_clean_files
|
||||
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
||||
{ echo "$as_me:10261: creating $CONFIG_STATUS" >&5
|
||||
{ echo "$as_me:10262: creating $CONFIG_STATUS" >&5
|
||||
echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||||
cat >$CONFIG_STATUS <<_ACEOF
|
||||
#! $SHELL
|
||||
@ -10430,7 +10431,7 @@ cat >>$CONFIG_STATUS <<\EOF
|
||||
echo "$ac_cs_version"; exit 0 ;;
|
||||
--he | --h)
|
||||
# Conflict between --help and --header
|
||||
{ { echo "$as_me:10433: error: ambiguous option: $1
|
||||
{ { echo "$as_me:10434: error: ambiguous option: $1
|
||||
Try \`$0 --help' for more information." >&5
|
||||
echo "$as_me: error: ambiguous option: $1
|
||||
Try \`$0 --help' for more information." >&2;}
|
||||
@ -10449,7 +10450,7 @@ Try \`$0 --help' for more information." >&2;}
|
||||
ac_need_defaults=false;;
|
||||
|
||||
# This is an error.
|
||||
-*) { { echo "$as_me:10452: error: unrecognized option: $1
|
||||
-*) { { echo "$as_me:10453: error: unrecognized option: $1
|
||||
Try \`$0 --help' for more information." >&5
|
||||
echo "$as_me: error: unrecognized option: $1
|
||||
Try \`$0 --help' for more information." >&2;}
|
||||
@ -10502,7 +10503,7 @@ do
|
||||
"build/linux/DOC-linux.html" ) CONFIG_FILES="$CONFIG_FILES build/linux/DOC-linux.html" ;;
|
||||
"build/macosx/Info.plist" ) CONFIG_FILES="$CONFIG_FILES build/macosx/Info.plist" ;;
|
||||
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||
*) { { echo "$as_me:10505: error: invalid argument: $ac_config_target" >&5
|
||||
*) { { echo "$as_me:10506: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
{ (exit 1); exit 1; }; };;
|
||||
esac
|
||||
@ -10789,7 +10790,7 @@ done; }
|
||||
esac
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:10792: creating $ac_file" >&5
|
||||
{ echo "$as_me:10793: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
@ -10807,7 +10808,7 @@ echo "$as_me: creating $ac_file" >&6;}
|
||||
-) echo $tmp/stdin ;;
|
||||
[\\/$]*)
|
||||
# Absolute (can't be DOS-style, as IFS=:)
|
||||
test -f "$f" || { { echo "$as_me:10810: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:10811: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -10820,7 +10821,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:10823: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:10824: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -10880,7 +10881,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
|
||||
* ) ac_file_in=$ac_file.in ;;
|
||||
esac
|
||||
|
||||
test x"$ac_file" != x- && { echo "$as_me:10883: creating $ac_file" >&5
|
||||
test x"$ac_file" != x- && { echo "$as_me:10884: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
|
||||
# First look for the input files in the build tree, otherwise in the
|
||||
@ -10891,7 +10892,7 @@ echo "$as_me: creating $ac_file" >&6;}
|
||||
-) echo $tmp/stdin ;;
|
||||
[\\/$]*)
|
||||
# Absolute (can't be DOS-style, as IFS=:)
|
||||
test -f "$f" || { { echo "$as_me:10894: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:10895: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -10904,7 +10905,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:10907: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:10908: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -11021,7 +11022,7 @@ cat >>$CONFIG_STATUS <<\EOF
|
||||
rm -f $tmp/in
|
||||
if test x"$ac_file" != x-; then
|
||||
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
|
||||
{ echo "$as_me:11024: $ac_file is unchanged" >&5
|
||||
{ echo "$as_me:11025: $ac_file is unchanged" >&5
|
||||
echo "$as_me: $ac_file is unchanged" >&6;}
|
||||
else
|
||||
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
|
||||
@ -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.142 2002-10-02 00:09:49 bdenney Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.143 2002-10-02 00:53:20 bdenney Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl // Put Bochs version information right here so that it gets substituted
|
||||
@ -1497,6 +1497,7 @@ elif test "$with_wx" = yes; then
|
||||
case $target in
|
||||
*-pc-windows* | *-cygwin* | *-mingw32*)
|
||||
EXTRA_BX_OBJS="$EXTRA_BX_OBJS wxbochs_resources.o"
|
||||
GUI_LINK_OPTS_WX="$GUI_LINK_OPTS_WX --subsystem,windows -mwindows"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user