- detection of the socket function (used by RFB) fixed for the win32 target
This commit is contained in:
Volker Ruppert
parent
8df8546e5b
commit
69d8b791f4
88
bochs/configure
vendored
88
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.215 2003/06/13 16:05:01 vruppert Exp .
|
||||
# From configure.in Id: configure.in,v 1.216 2003/07/05 05:31:40 vruppert Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.53.
|
||||
#
|
||||
@ -22772,8 +22772,74 @@ done
|
||||
LIBS="$old_LIBS"
|
||||
fi
|
||||
|
||||
if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
||||
# we need the socket function. if cross configuring, don't bother.
|
||||
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
|
||||
|
||||
;;
|
||||
*)
|
||||
|
||||
for ac_func in socket
|
||||
do
|
||||
@ -22850,8 +22916,8 @@ _ACEOF
|
||||
fi
|
||||
done
|
||||
|
||||
if test "$have_socket" != yes; then
|
||||
echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
|
||||
if test "$have_socket" != yes; then
|
||||
echo "$as_me:$LINENO: 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
|
||||
@ -22907,14 +22973,18 @@ fi
|
||||
echo "$as_me:$LINENO: 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"
|
||||
else
|
||||
|
||||
echo 'ERROR: socket function required for RFB compile'
|
||||
exit 1
|
||||
RFB_LIBS="$RFB_LIBS -lsocket"
|
||||
have_socket=yes
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if test "$have_socket" != yes; then
|
||||
echo 'ERROR: socket function required for RFB compile'
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -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.216 2003-07-05 05:31:40 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.217 2003-07-06 09:00:36 vruppert Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -2135,16 +2135,30 @@ if test "$with_term" = yes; then
|
||||
LIBS="$old_LIBS"
|
||||
fi
|
||||
|
||||
if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
||||
# we need the socket function. if cross configuring, don't bother.
|
||||
AC_CHECK_FUNCS(socket, have_socket=yes)
|
||||
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
|
||||
])
|
||||
;;
|
||||
*)
|
||||
AC_CHECK_FUNCS(socket, have_socket=yes)
|
||||
if test "$have_socket" != yes; then
|
||||
AC_CHECK_LIB(socket, socket,
|
||||
[
|
||||
RFB_LIBS="$RFB_LIBS -lsocket"
|
||||
have_socket=yes
|
||||
])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if test "$have_socket" != yes; then
|
||||
AC_CHECK_LIB(socket, socket,
|
||||
[ RFB_LIBS="$RFB_LIBS -lsocket" ],
|
||||
[
|
||||
echo 'ERROR: socket function required for RFB compile'
|
||||
exit 1
|
||||
])
|
||||
echo 'ERROR: socket function required for RFB compile'
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user