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

- the names of the object files for the lowlevel network support are now stored

Browse Source 
in NETLOW_OBJS. The value of NE2K_OBJS is now 'ne2k.o' if ne2k support is
  enabled. These changes are necessary before converting the ne2k to a plugin.
This commit is contained in:
Volker Ruppert 2002-11-17 12:49:46 +00:00
parent 70b69a2a64
commit cde5737dc5
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in,v 1.165 2002/11/14 18:45:41 bdenney Exp . # From configure.in Id: configure.in,v 1.166 2002/11/16 13:43:38 bdenney Exp .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53. # Generated by GNU Autoconf 2.53.
# #
@ -1119,7 +1119,7 @@ esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute. # absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
@ -1497,6 +1497,8 @@ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
test -z "$build_alias" &&
build_alias=$ac_cv_build
echo "$as_me:$LINENO: checking host system type" >&5 echo "$as_me:$LINENO: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6 echo $ECHO_N "checking host system type... $ECHO_C" >&6
@ -1519,6 +1521,8 @@ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
test -z "$host_alias" &&
host_alias=$ac_cv_host
echo "$as_me:$LINENO: checking target system type" >&5 echo "$as_me:$LINENO: checking target system type" >&5
echo $ECHO_N "checking target system type... $ECHO_C" >&6 echo $ECHO_N "checking target system type... $ECHO_C" >&6
@ -1548,6 +1552,9 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \ test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
test -z "$target_alias" &&
target_alias=$ac_cv_target
if test "$with_win32_vcpp"; then if test "$with_win32_vcpp"; then
echo "WARNING: The --with-win32-vcpp option will be treated as:" echo "WARNING: The --with-win32-vcpp option will be treated as:"
@ -4202,7 +4209,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4205 "configure"' > conftest.$ac_ext echo '#line 4212 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -4752,7 +4759,7 @@ chmod -w .
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no compiler_c_o=no
if { (eval echo configure:4755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then if { (eval echo configure:4762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
if test -s out/conftest.err; then if test -s out/conftest.err; then
@ -6583,7 +6590,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6586 "configure" #line 6593 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -6681,7 +6688,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6684 "configure" #line 6691 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -8723,7 +8730,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8726 "configure" #line 8733 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -18344,7 +18351,8 @@ echo "${ECHO_T}yes" >&6
#define BX_NE2K_SUPPORT 1 #define BX_NE2K_SUPPORT 1
_ACEOF _ACEOF
NE2K_OBJS='ne2k.o eth.o eth_null.o' NE2K_OBJS='ne2k.o'
NETLOW_OBJS='eth.o eth_null.o'
if test "${ac_cv_header_net_bpf_h+set}" = set; then if test "${ac_cv_header_net_bpf_h+set}" = set; then
echo "$as_me:$LINENO: checking for net/bpf.h" >&5 echo "$as_me:$LINENO: checking for net/bpf.h" >&5
echo $ECHO_N "checking for net/bpf.h... $ECHO_C" >&6 echo $ECHO_N "checking for net/bpf.h... $ECHO_C" >&6
@ -18447,7 +18455,7 @@ echo "${ECHO_T}$ac_cv_header_net_bpf_h" >&6
fi fi
if test $ac_cv_header_net_bpf_h = yes; then if test $ac_cv_header_net_bpf_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_fbsd.o" NETLOW_OBJS="$NETLOW_OBJS eth_fbsd.o"
fi fi
@ -18553,7 +18561,7 @@ echo "${ECHO_T}$ac_cv_header_netpacket_packet_h" >&6
fi fi
if test $ac_cv_header_netpacket_packet_h = yes; then if test $ac_cv_header_netpacket_packet_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_linux.o" NETLOW_OBJS="$NETLOW_OBJS eth_linux.o"
fi fi
@ -18596,7 +18604,7 @@ echo "$as_me:$LINENO: result: $ac_cv_header_linux_netlink_h" >&5
echo "${ECHO_T}$ac_cv_header_linux_netlink_h" >&6 echo "${ECHO_T}$ac_cv_header_linux_netlink_h" >&6
if test $ac_cv_header_linux_netlink_h = yes; then if test $ac_cv_header_linux_netlink_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_tap.o" NETLOW_OBJS="$NETLOW_OBJS eth_tap.o"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_ETHERTAP 1 #define HAVE_ETHERTAP 1
_ACEOF _ACEOF
@ -18644,7 +18652,7 @@ echo "$as_me:$LINENO: result: $ac_cv_header_linux_if_tun_h" >&5
echo "${ECHO_T}$ac_cv_header_linux_if_tun_h" >&6 echo "${ECHO_T}$ac_cv_header_linux_if_tun_h" >&6
if test $ac_cv_header_linux_if_tun_h = yes; then if test $ac_cv_header_linux_if_tun_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_tuntap.o" NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_TUNTAP 1 #define HAVE_TUNTAP 1
_ACEOF _ACEOF
@ -18655,7 +18663,7 @@ fi
case "$target" in case "$target" in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*) *-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
NE2K_OBJS="$NE2K_OBJS eth_win32.o" NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
;; ;;
esac esac
networking=yes networking=yes
@ -18667,6 +18675,7 @@ echo "${ECHO_T}no" >&6
_ACEOF _ACEOF
NE2K_OBJS='' NE2K_OBJS=''
NETLOW_OBJS=''
networking=no networking=no
fi fi
else else
@ -18678,6 +18687,7 @@ echo "${ECHO_T}no" >&6
_ACEOF _ACEOF
NE2K_OBJS='' NE2K_OBJS=''
NETLOW_OBJS=''
networking=no networking=no
@ -18685,6 +18695,7 @@ fi;
echo "$as_me:$LINENO: checking for i440FX PCI support" >&5 echo "$as_me:$LINENO: checking for i440FX PCI support" >&5
echo $ECHO_N "checking for i440FX PCI support... $ECHO_C" >&6 echo $ECHO_N "checking for i440FX PCI support... $ECHO_C" >&6
# Check whether --enable-pci or --disable-pci was given. # Check whether --enable-pci or --disable-pci was given.
@ -22468,6 +22479,7 @@ s,@IOAPIC_OBJS@,$IOAPIC_OBJS,;t t
s,@APIC_OBJS@,$APIC_OBJS,;t t s,@APIC_OBJS@,$APIC_OBJS,;t t
s,@BX_SPLIT_HD_SUPPORT@,$BX_SPLIT_HD_SUPPORT,;t t s,@BX_SPLIT_HD_SUPPORT@,$BX_SPLIT_HD_SUPPORT,;t t
s,@NE2K_OBJS@,$NE2K_OBJS,;t t s,@NE2K_OBJS@,$NE2K_OBJS,;t t
s,@NETLOW_OBJS@,$NETLOW_OBJS,;t t
s,@PCI_OBJ@,$PCI_OBJ,;t t s,@PCI_OBJ@,$PCI_OBJ,;t t
s,@SUFFIX_LINE@,$SUFFIX_LINE,;t t s,@SUFFIX_LINE@,$SUFFIX_LINE,;t t
s,@CPP_SUFFIX@,$CPP_SUFFIX,;t t s,@CPP_SUFFIX@,$CPP_SUFFIX,;t t
@ -22652,7 +22664,7 @@ esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute. # absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

18
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_PREREQ(2.50)
AC_INIT(bochs.h) AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.166 2002-11-16 13:43:38 bdenney Exp $]]) AC_REVISION([[$Id: configure.in,v 1.167 2002-11-17 12:49:46 vruppert Exp $]])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h) AC_CONFIG_HEADER(ltdlconf.h)
@ -666,11 +666,12 @@ AC_ARG_ENABLE(ne2000,
[if test "$enableval" = yes; then [if test "$enableval" = yes; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(BX_NE2K_SUPPORT, 1) AC_DEFINE(BX_NE2K_SUPPORT, 1)
NE2K_OBJS='ne2k.o eth.o eth_null.o' NE2K_OBJS='ne2k.o'
AC_CHECK_HEADER(net/bpf.h, NE2K_OBJS="$NE2K_OBJS eth_fbsd.o") NETLOW_OBJS='eth.o eth_null.o'
AC_CHECK_HEADER(netpacket/packet.h, NE2K_OBJS="$NE2K_OBJS eth_linux.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(linux/netlink.h, [ AC_CHECK_HEADER(linux/netlink.h, [
NE2K_OBJS="$NE2K_OBJS eth_tap.o" NETLOW_OBJS="$NETLOW_OBJS eth_tap.o"
AC_DEFINE(HAVE_ETHERTAP, 1) AC_DEFINE(HAVE_ETHERTAP, 1)
], [], ], [],
[ [
@ -678,7 +679,7 @@ AC_ARG_ENABLE(ne2000,
#include <sys/socket.h> #include <sys/socket.h>
]) ])
AC_CHECK_HEADER(linux/if_tun.h, [ AC_CHECK_HEADER(linux/if_tun.h, [
NE2K_OBJS="$NE2K_OBJS eth_tuntap.o" NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
AC_DEFINE(HAVE_TUNTAP, 1) AC_DEFINE(HAVE_TUNTAP, 1)
], [], ], [],
[ [
@ -687,7 +688,7 @@ AC_ARG_ENABLE(ne2000,
]) ])
case "$target" in case "$target" in
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*) *-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
NE2K_OBJS="$NE2K_OBJS eth_win32.o" NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
;; ;;
esac esac
networking=yes networking=yes
@ -695,16 +696,19 @@ AC_ARG_ENABLE(ne2000,
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_DEFINE(BX_NE2K_SUPPORT, 0) AC_DEFINE(BX_NE2K_SUPPORT, 0)
NE2K_OBJS='' NE2K_OBJS=''
NETLOW_OBJS=''
networking=no networking=no
fi], fi],
[ [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_DEFINE(BX_NE2K_SUPPORT, 0) AC_DEFINE(BX_NE2K_SUPPORT, 0)
NE2K_OBJS='' NE2K_OBJS=''
NETLOW_OBJS=''
networking=no networking=no
] ]
) )
AC_SUBST(NE2K_OBJS) AC_SUBST(NE2K_OBJS)
AC_SUBST(NETLOW_OBJS)
AC_MSG_CHECKING(for i440FX PCI support) AC_MSG_CHECKING(for i440FX PCI support)

2
bochs/iodev/Makefile.in
View File

@ -67,7 +67,7 @@ OBJS_THAT_CANNOT_BE_PLUGINS = \
devices.o \ devices.o \
pit.o pit82c54.o pit_wrap.o \ pit.o pit82c54.o pit_wrap.o \
@IODEBUG_OBJS@ \ @IODEBUG_OBJS@ \
@NE2K_OBJS@ \ @NE2K_OBJS@ @NETLOW_OBJS@ \
@SLOWDOWN_OBJS@ \ @SLOWDOWN_OBJS@ \
$(MCH_OBJS) \ $(MCH_OBJS) \
$(IOAPIC_OBJS) $(IOAPIC_OBJS)