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

- avoid ethertap detection when compiling for win32

Browse Source
This commit is contained in:
Christophe Bothamy 2003-08-22 00:57:31 +00:00
parent cfad66bcc7
commit 8d8ae28b2f
2 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.222 2003/08/17 23:40:38 cbothamy Exp .
# From configure.in Id: configure.in,v 1.223 2003/08/19 00:10:38 cbothamy Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57.
#
@ -21244,7 +21244,12 @@ if test $ac_cv_header_netpacket_packet_h = yes; then
fi
echo "$as_me:$LINENO: checking for net/if.h" >&5
case "$target" in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
;;
*)
echo "$as_me:$LINENO: checking for net/if.h" >&5
echo $ECHO_N "checking for net/if.h... $ECHO_C" >&6
if test "${ac_cv_header_net_if_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -21257,8 +21262,8 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
@ -21288,12 +21293,12 @@ echo "$as_me:$LINENO: result: $ac_cv_header_net_if_h" >&5
echo "${ECHO_T}$ac_cv_header_net_if_h" >&6
if test $ac_cv_header_net_if_h = yes; then
use_ethertap=yes
use_ethertap=yes
fi
echo "$as_me:$LINENO: checking for linux/netlink.h" >&5
echo "$as_me:$LINENO: checking for linux/netlink.h" >&5
echo $ECHO_N "checking for linux/netlink.h... $ECHO_C" >&6
if test "${ac_cv_header_linux_netlink_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -21306,8 +21311,8 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <asm/types.h>
#include <sys/socket.h>
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/netlink.h>
@ -21337,21 +21342,21 @@ echo "$as_me:$LINENO: result: $ac_cv_header_linux_netlink_h" >&5
echo "${ECHO_T}$ac_cv_header_linux_netlink_h" >&6
if test $ac_cv_header_linux_netlink_h = yes; then
use_ethertap=yes
use_ethertap=yes
fi
if test "$use_ethertap" = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tap.o"
cat >>confdefs.h <<\_ACEOF
if test "$use_ethertap" = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tap.o"
cat >>confdefs.h <<\_ACEOF
#define HAVE_ETHERTAP 1
_ACEOF
fi
fi
echo "$as_me:$LINENO: checking for linux/if_tun.h" >&5
echo "$as_me:$LINENO: checking for linux/if_tun.h" >&5
echo $ECHO_N "checking for linux/if_tun.h... $ECHO_C" >&6
if test "${ac_cv_header_linux_if_tun_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -21364,8 +21369,8 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <asm/types.h>
#include <sys/socket.h>
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/if_tun.h>
@ -21395,8 +21400,8 @@ echo "$as_me:$LINENO: result: $ac_cv_header_linux_if_tun_h" >&5
echo "${ECHO_T}$ac_cv_header_linux_if_tun_h" >&6
if test $ac_cv_header_linux_if_tun_h = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
cat >>confdefs.h <<\_ACEOF
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
cat >>confdefs.h <<\_ACEOF
#define HAVE_TUNTAP 1
_ACEOF
@ -21404,9 +21409,6 @@ _ACEOF
fi
case "$target" in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
;;
esac
networking=yes

60
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.223 2003-08-19 00:10:38 cbothamy Exp $]])
AC_REVISION([[$Id: configure.in,v 1.224 2003-08-22 00:57:31 cbothamy Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -716,38 +716,40 @@ AC_ARG_ENABLE(ne2000,
NETLOW_OBJS='eth.o eth_null.o'
AC_CHECK_HEADER(net/bpf.h, NETLOW_OBJS="$NETLOW_OBJS eth_fbsd.o")
AC_CHECK_HEADER(netpacket/packet.h, NETLOW_OBJS="$NETLOW_OBJS eth_linux.o")
AC_CHECK_HEADER(net/if.h, [
use_ethertap=yes
], [],
[
#include <sys/types.h>
#include <sys/socket.h>
])
AC_CHECK_HEADER(linux/netlink.h, [
use_ethertap=yes
], [],
[
#include <asm/types.h>
#include <sys/socket.h>
])
if test "$use_ethertap" = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tap.o"
AC_DEFINE(HAVE_ETHERTAP, 1)
fi
AC_CHECK_HEADER(linux/if_tun.h, [
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
AC_DEFINE(HAVE_TUNTAP, 1)
], [],
[
#include <asm/types.h>
#include <sys/socket.h>
])
case "$target" in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
;;
*)
AC_CHECK_HEADER(net/if.h, [
use_ethertap=yes
], [],
[
#include <sys/types.h>
#include <sys/socket.h>
])
AC_CHECK_HEADER(linux/netlink.h, [
use_ethertap=yes
], [],
[
#include <asm/types.h>
#include <sys/socket.h>
])
if test "$use_ethertap" = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tap.o"
AC_DEFINE(HAVE_ETHERTAP, 1)
fi
AC_CHECK_HEADER(linux/if_tun.h, [
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
AC_DEFINE(HAVE_TUNTAP, 1)
], [],
[
#include <asm/types.h>
#include <sys/socket.h>
])
;;
esac
networking=yes
else