diff --git a/bochs/configure b/bochs/configure index 70f6a2a06..c4a28c914 100755 --- a/bochs/configure +++ b/bochs/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 13805 2020-02-01 18:05:54Z vruppert . +# From configure.in Id: configure.in 13810 2020-02-07 23:32:27Z vruppert . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -23673,7 +23673,7 @@ fi " if test "x$ac_cv_header_net_if_h" = xyes; then : - use_ethertap=yes + use_vde=yes $as_echo "#define BX_HAVE_NET_IF_H 1" >>confdefs.h @@ -23687,17 +23687,15 @@ fi " if test "x$ac_cv_header_linux_netlink_h" = xyes; then : - use_ethertap=yes + use_vde=yes fi - if test "$use_ethertap" = yes; then - NETLOW_OBJS="$NETLOW_OBJS eth_tap.o eth_vde.o" - ethernet_modules="$ethernet_modules tap vde" - $as_echo "#define BX_NETMOD_TAP 1" >>confdefs.h - + if test "$use_vde" = yes; then + NETLOW_OBJS="$NETLOW_OBJS eth_vde.o" + ethernet_modules="$ethernet_modules vde" $as_echo "#define BX_NETMOD_VDE 1" >>confdefs.h fi @@ -25152,8 +25150,6 @@ case "$target" in $as_echo "#define BX_NETMOD_TUNTAP 0" >>confdefs.h - $as_echo "#define BX_NETMOD_TAP 0" >>confdefs.h - ;; *-pc-windows*) INSTALL_TARGET='install_win32' @@ -25215,8 +25211,6 @@ case "$target" in READLINE_LIB=""; $as_echo "#define BX_HAVE_DLFCN_H 0" >>confdefs.h - $as_echo "#define BX_NETMOD_TAP 0" >>confdefs.h - ;; *-cygwin*) EXE=".exe" diff --git a/bochs/configure.in b/bochs/configure.in index 1c12606b7..9c7194071 100644 --- a/bochs/configure.in +++ b/bochs/configure.in @@ -1735,7 +1735,7 @@ if test "$networking" = yes; then ;; *) AC_CHECK_HEADER(net/if.h, [ - use_ethertap=yes + use_vde=yes AC_DEFINE(BX_HAVE_NET_IF_H, 1) ], [], [ @@ -1743,17 +1743,16 @@ if test "$networking" = yes; then #include ]) AC_CHECK_HEADER(linux/netlink.h, [ - use_ethertap=yes + use_vde=yes ], [], [ #include #include ]) - if test "$use_ethertap" = yes; then - NETLOW_OBJS="$NETLOW_OBJS eth_tap.o eth_vde.o" - ethernet_modules="$ethernet_modules tap vde" - AC_DEFINE(BX_NETMOD_TAP, 1) + if test "$use_vde" = yes; then + NETLOW_OBJS="$NETLOW_OBJS eth_vde.o" + ethernet_modules="$ethernet_modules vde" AC_DEFINE(BX_NETMOD_VDE, 1) fi @@ -2768,7 +2767,6 @@ case "$target" in AC_DEFINE(BX_HAVE_GETTIMEOFDAY, 0) AC_DEFINE(BX_NO_ATTRIBUTES, 1) AC_DEFINE(BX_NETMOD_TUNTAP, 0) - AC_DEFINE(BX_NETMOD_TAP, 0) ;; *-pc-windows*) INSTALL_TARGET='install_win32' @@ -2824,7 +2822,6 @@ case "$target" in AC_DEFINE(HAVE_READLINE_HISTORY_H, 0) READLINE_LIB=""; AC_DEFINE(BX_HAVE_DLFCN_H, 0) - AC_DEFINE(BX_NETMOD_TAP, 0) ;; *-cygwin*) EXE=".exe"