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

- Fixes bug #534760: buggy detection of ethertap header.

Browse Source
This commit is contained in:
Bryce Denney 2002-03-26 05:59:12 +00:00
parent 4cc48908b4
commit 6347533913
2 changed files with 13 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
bochs/configure vendored
View File

@ -8594,22 +8594,19 @@ if test $ac_cv_header_netpacket_packet_h = yes; then
fi
if test "${ac_cv_header_linux_netlink_h+set}" = set; then
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
fi
echo "$as_me:$LINENO: result: $ac_cv_header_linux_netlink_h" >&5
echo "${ECHO_T}$ac_cv_header_linux_netlink_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking linux/netlink.h usability" >&5
echo $ECHO_N "checking linux/netlink.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
$ac_includes_default
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/netlink.h>
_ACEOF
rm -f conftest.$ac_objext
@ -8624,77 +8621,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_header_compiler=yes
ac_cv_header_linux_netlink_h=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_header_compiler=no
ac_cv_header_linux_netlink_h=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking linux/netlink.h presence" >&5
echo $ECHO_N "checking linux/netlink.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <linux/netlink.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
{ echo "$as_me:$LINENO: WARNING: linux/netlink.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: linux/netlink.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/netlink.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: linux/netlink.h: proceeding with the preprocessor's result" >&2;};;
no:yes )
{ echo "$as_me:$LINENO: WARNING: linux/netlink.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: linux/netlink.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/netlink.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: linux/netlink.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/netlink.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: linux/netlink.h: proceeding with the preprocessor's result" >&2;};;
esac
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
else
ac_cv_header_linux_netlink_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_linux_netlink_h" >&5
echo "${ECHO_T}$ac_cv_header_linux_netlink_h" >&6
fi
if test $ac_cv_header_linux_netlink_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_tap.o"

4
bochs/configure.in
View File

@ -446,6 +446,10 @@ AC_ARG_ENABLE(ne2000,
AC_CHECK_HEADER(linux/netlink.h, [
NE2K_OBJS="$NE2K_OBJS eth_tap.o"
AC_DEFINE(HAVE_ETHERTAP, 1)
], [],
[
#include <asm/types.h>
#include <sys/socket.h>
])
if test "$with_win32" = yes; then
NE2K_OBJS="$NE2K_OBJS eth_win32.o"