mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- check for socket() in wsock32 removed (it doesn't work this way)

Browse Source
This commit is contained in:
Volker Ruppert 2003-07-06 11:46:31 +00:00
parent 69d8b791f4
commit b0da735fd8
2 changed files with 8 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.216 2003/07/05 05:31:40 vruppert Exp .
# From configure.in Id: configure.in,v 1.217 2003/07/06 09:00:36 vruppert Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53.
#
@ -22776,68 +22776,9 @@ if test "$with_rfb" = yes; then
# we need the socket function
case $target in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
echo "$as_me:$LINENO: checking for socket in -lwsock32" >&5
echo $ECHO_N "checking for socket in -lwsock32... $ECHO_C" >&6
if test "${ac_cv_lib_wsock32_socket+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwsock32 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char socket ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
socket ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (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_cv_lib_wsock32_socket=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_wsock32_socket=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_wsock32_socket" >&5
echo "${ECHO_T}$ac_cv_lib_wsock32_socket" >&6
if test $ac_cv_lib_wsock32_socket = yes; then
RFB_LIBS="$RFB_LIBS -lwsock32"
have_socket=yes
fi
# is this okay without a check ?
RFB_LIBS="$RFB_LIBS -lwsock32"
have_socket=yes
;;
*)

10
bochs/configure.in
View File

@ -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.217 2003-07-06 09:00:36 vruppert Exp $]])
AC_REVISION([[$Id: configure.in,v 1.218 2003-07-06 11:46:31 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -2139,11 +2139,9 @@ if test "$with_rfb" = yes; then
# we need the socket function
case $target in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
AC_CHECK_LIB(wsock32, socket,
[
RFB_LIBS="$RFB_LIBS -lwsock32"
have_socket=yes
])
# is this okay without a check ?
RFB_LIBS="$RFB_LIBS -lwsock32"
have_socket=yes
;;
*)
AC_CHECK_FUNCS(socket, have_socket=yes)