Patch to build BSD/OS 4.0.1; from Bert Driehuis -- driehuis@playbeing.org
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@3310 06827809-a52a-0410-b366-d66718629ded
diff --git a/acconfig.h b/acconfig.h
index c29a683..e055b9e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -144,6 +144,9 @@
/* Use BSD 4.4 routing table entries? */
#undef RTENTRY_4_4
+/* Does struct sockaddr have a sa_len field? */
+#undef STRUCT_SOCKADDR_HAS_SA_LEN
+
/* rtentry structure tests */
#undef RTENTRY_RT_NEXT
#undef STRUCT_RTENTRY_HAS_RT_DST
diff --git a/config.h.in b/config.h.in
index b0b939c..8a6ba71 100644
--- a/config.h.in
+++ b/config.h.in
@@ -671,6 +671,9 @@
/* Use BSD 4.4 routing table entries? */
#undef RTENTRY_4_4
+/* Does struct sockaddr have a sa_len field? */
+#undef STRUCT_SOCKADDR_HAS_SA_LEN
+
/* rtentry structure tests */
#undef RTENTRY_RT_NEXT
#undef STRUCT_RTENTRY_HAS_RT_DST
diff --git a/configure b/configure
index 75c7fda..d3571cf 100755
--- a/configure
+++ b/configure
@@ -5481,13 +5481,13 @@
-ac_safe_struct=`echo "rtentry" | sed 'y%./+-%__p_%'`
-ac_safe_member=`echo "rt_dst" | sed 'y%./+-%__p_%'`
+ac_safe_struct=`echo "sockaddr" | sed 'y%./+-%__p_%'`
+ac_safe_member=`echo "sa_len" | sed 'y%./+-%__p_%'`
ac_safe_all="ac_cv_struct_${ac_safe_struct}_has_${ac_safe_member}"
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-echo $ac_n "checking for rtentry.rt_dst""... $ac_c" 1>&6
-echo "configure:5491: checking for rtentry.rt_dst" >&5
+echo $ac_n "checking for sockaddr.sa_len""... $ac_c" 1>&6
+echo "configure:5491: checking for sockaddr.sa_len" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5510,6 +5510,72 @@
#include <sys/socket.h>
#undef KERNEL
#undef _KERNEL
+
+
+int main() {
+
+struct sockaddr testit;
+testit.sa_len $defineit;
+
+; return 0; }
+EOF
+if { (eval echo configure:5523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ eval "${ac_safe_all}=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "${ac_safe_all}=no"
+fi
+rm -f conftest*
+
+fi
+
+
+if eval "test \"x$`echo ${ac_safe_all}`\" = \"xyes\""; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<EOF
+#define $ac_uc_define 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+
+
+
+ac_safe_struct=`echo "rtentry" | sed 'y%./+-%__p_%'`
+ac_safe_member=`echo "rt_dst" | sed 'y%./+-%__p_%'`
+ac_safe_all="ac_cv_struct_${ac_safe_struct}_has_${ac_safe_member}"
+ ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+
+echo $ac_n "checking for rtentry.rt_dst""... $ac_c" 1>&6
+echo "configure:5557: checking for rtentry.rt_dst" >&5
+if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+if test "xno" = "x"; then
+ defineit="= 0"
+elif test "xno" = "xno"; then
+ defineit=""
+else
+ defineit="no"
+fi
+cat > conftest.$ac_ext <<EOF
+#line 5570 "configure"
+#include "confdefs.h"
+
+
+#include <sys/types.h>
+#define KERNEL
+#define _KERNEL
+#include <sys/socket.h>
+#undef KERNEL
+#undef _KERNEL
#include <net/route.h>
@@ -5520,7 +5586,7 @@
; return 0; }
EOF
-if { (eval echo configure:5524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -5547,14 +5613,14 @@
echo $ac_n "checking type of rtentry structure""... $ac_c" 1>&6
-echo "configure:5551: checking type of rtentry structure" >&5
+echo "configure:5617: checking type of rtentry structure" >&5
if eval "test \"`echo '$''{'ac_cv_RTENTRY_TYPE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5558 "configure"
+#line 5624 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5578,7 +5644,7 @@
; return 0; }
EOF
-if { (eval echo configure:5582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_RTENTRY_TYPE="BSD-4.4"
else
@@ -5589,7 +5655,7 @@
if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
cat > conftest.$ac_ext <<EOF
-#line 5593 "configure"
+#line 5659 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5607,7 +5673,7 @@
; return 0; }
EOF
-if { (eval echo configure:5611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_RTENTRY_TYPE="BSD-4.3"
else
@@ -5636,12 +5702,12 @@
if test "x$ac_cv_RTENTRY_TYPE" = "xunknown"; then
echo $ac_n "checking for struct rtentry""... $ac_c" 1>&6
-echo "configure:5640: checking for struct rtentry" >&5
+echo "configure:5706: checking for struct rtentry" >&5
if eval "test \"`echo '$''{'ac_cv_struct_rtentry'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5645 "configure"
+#line 5711 "configure"
#include "confdefs.h"
#define KERNEL
#include<net/route.h>
@@ -5685,13 +5751,13 @@
if test "x$ac_cv_RTENTRY_TYPE" = "xBSD-4.3"; then
echo $ac_n "checking for struct rtentry has a rt_next node""... $ac_c" 1>&6
-echo "configure:5689: checking for struct rtentry has a rt_next node" >&5
+echo "configure:5755: checking for struct rtentry has a rt_next node" >&5
if eval "test \"`echo '$''{'ac_cv_struct_rtentry_rt_next'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5695 "configure"
+#line 5761 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5709,7 +5775,7 @@
; return 0; }
EOF
-if { (eval echo configure:5713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_rtentry_rt_next=yes
else
@@ -5741,7 +5807,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for rtentry.rt_unit""... $ac_c" 1>&6
-echo "configure:5745: checking for rtentry.rt_unit" >&5
+echo "configure:5811: checking for rtentry.rt_unit" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5754,7 +5820,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 5758 "configure"
+#line 5824 "configure"
#include "confdefs.h"
@@ -5774,7 +5840,7 @@
; return 0; }
EOF
-if { (eval echo configure:5778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -5808,7 +5874,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for rtentry.rt_refcnt""... $ac_c" 1>&6
-echo "configure:5812: checking for rtentry.rt_refcnt" >&5
+echo "configure:5878: checking for rtentry.rt_refcnt" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5821,7 +5887,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 5825 "configure"
+#line 5891 "configure"
#include "confdefs.h"
@@ -5841,7 +5907,7 @@
; return 0; }
EOF
-if { (eval echo configure:5845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -5875,7 +5941,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for rtentry.rt_hash""... $ac_c" 1>&6
-echo "configure:5879: checking for rtentry.rt_hash" >&5
+echo "configure:5945: checking for rtentry.rt_hash" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5888,7 +5954,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 5892 "configure"
+#line 5958 "configure"
#include "confdefs.h"
@@ -5908,7 +5974,7 @@
; return 0; }
EOF
-if { (eval echo configure:5912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -5942,7 +6008,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for rtentry.rt_use""... $ac_c" 1>&6
-echo "configure:5946: checking for rtentry.rt_use" >&5
+echo "configure:6012: checking for rtentry.rt_use" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5955,7 +6021,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 5959 "configure"
+#line 6025 "configure"
#include "confdefs.h"
@@ -5975,7 +6041,7 @@
; return 0; }
EOF
-if { (eval echo configure:5979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6009,7 +6075,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for tcpstat.tcp_rcvmemdrop""... $ac_c" 1>&6
-echo "configure:6013: checking for tcpstat.tcp_rcvmemdrop" >&5
+echo "configure:6079: checking for tcpstat.tcp_rcvmemdrop" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6022,7 +6088,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6026 "configure"
+#line 6092 "configure"
#include "confdefs.h"
@@ -6044,7 +6110,7 @@
; return 0; }
EOF
-if { (eval echo configure:6048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6079,7 +6145,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_mtu""... $ac_c" 1>&6
-echo "configure:6083: checking for ifnet.if_mtu" >&5
+echo "configure:6149: checking for ifnet.if_mtu" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6092,7 +6158,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6096 "configure"
+#line 6162 "configure"
#include "confdefs.h"
@@ -6111,7 +6177,7 @@
; return 0; }
EOF
-if { (eval echo configure:6115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6139,7 +6205,7 @@
if test "x$ac_cv_struct_ifnet_has_if_mtu" = "xno"; then
echo $ac_n "checking if _KERNEL needs to be defined for if_mtu""... $ac_c" 1>&6
-echo "configure:6143: checking if _KERNEL needs to be defined for if_mtu" >&5
+echo "configure:6209: checking if _KERNEL needs to be defined for if_mtu" >&5
if eval "test \"`echo '$''{'ac_cv_IFNET_NEEDS_KERNEL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6148,7 +6214,7 @@
ac_cv_IFNET_NEEDS_KERNEL=no
else
cat > conftest.$ac_ext <<EOF
-#line 6152 "configure"
+#line 6218 "configure"
#include "confdefs.h"
#define _KERNEL 1
@@ -6169,7 +6235,7 @@
; return 0; }
EOF
-if { (eval echo configure:6173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_IFNET_NEEDS_KERNEL=yes
else
@@ -6201,7 +6267,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifaddr.ifa_next""... $ac_c" 1>&6
-echo "configure:6205: checking for ifaddr.ifa_next" >&5
+echo "configure:6271: checking for ifaddr.ifa_next" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6214,7 +6280,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6218 "configure"
+#line 6284 "configure"
#include "confdefs.h"
@@ -6239,7 +6305,7 @@
; return 0; }
EOF
-if { (eval echo configure:6243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6274,7 +6340,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_baudrate""... $ac_c" 1>&6
-echo "configure:6278: checking for ifnet.if_baudrate" >&5
+echo "configure:6344: checking for ifnet.if_baudrate" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6287,7 +6353,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6291 "configure"
+#line 6357 "configure"
#include "confdefs.h"
@@ -6346,7 +6412,7 @@
; return 0; }
EOF
-if { (eval echo configure:6350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6381,7 +6447,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_speed""... $ac_c" 1>&6
-echo "configure:6385: checking for ifnet.if_speed" >&5
+echo "configure:6451: checking for ifnet.if_speed" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6394,7 +6460,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6398 "configure"
+#line 6464 "configure"
#include "confdefs.h"
@@ -6453,7 +6519,7 @@
; return 0; }
EOF
-if { (eval echo configure:6457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6488,7 +6554,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_type""... $ac_c" 1>&6
-echo "configure:6492: checking for ifnet.if_type" >&5
+echo "configure:6558: checking for ifnet.if_type" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6501,7 +6567,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6505 "configure"
+#line 6571 "configure"
#include "confdefs.h"
@@ -6560,7 +6626,7 @@
; return 0; }
EOF
-if { (eval echo configure:6564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6595,7 +6661,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_imcasts""... $ac_c" 1>&6
-echo "configure:6599: checking for ifnet.if_imcasts" >&5
+echo "configure:6665: checking for ifnet.if_imcasts" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6608,7 +6674,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6612 "configure"
+#line 6678 "configure"
#include "confdefs.h"
@@ -6667,7 +6733,7 @@
; return 0; }
EOF
-if { (eval echo configure:6671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6702,7 +6768,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_iqdrops""... $ac_c" 1>&6
-echo "configure:6706: checking for ifnet.if_iqdrops" >&5
+echo "configure:6772: checking for ifnet.if_iqdrops" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6715,7 +6781,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6719 "configure"
+#line 6785 "configure"
#include "confdefs.h"
@@ -6774,7 +6840,7 @@
; return 0; }
EOF
-if { (eval echo configure:6778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6809,7 +6875,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_noproto""... $ac_c" 1>&6
-echo "configure:6813: checking for ifnet.if_noproto" >&5
+echo "configure:6879: checking for ifnet.if_noproto" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6822,7 +6888,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6826 "configure"
+#line 6892 "configure"
#include "confdefs.h"
@@ -6881,7 +6947,7 @@
; return 0; }
EOF
-if { (eval echo configure:6885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -6916,7 +6982,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_omcasts""... $ac_c" 1>&6
-echo "configure:6920: checking for ifnet.if_omcasts" >&5
+echo "configure:6986: checking for ifnet.if_omcasts" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6929,7 +6995,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 6933 "configure"
+#line 6999 "configure"
#include "confdefs.h"
@@ -6988,7 +7054,7 @@
; return 0; }
EOF
-if { (eval echo configure:6992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7023,7 +7089,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_xname""... $ac_c" 1>&6
-echo "configure:7027: checking for ifnet.if_xname" >&5
+echo "configure:7093: checking for ifnet.if_xname" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7036,7 +7102,7 @@
defineit="no"
fi
cat > conftest.$ac_ext <<EOF
-#line 7040 "configure"
+#line 7106 "configure"
#include "confdefs.h"
@@ -7095,7 +7161,7 @@
; return 0; }
EOF
-if { (eval echo configure:7099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7130,7 +7196,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_lastchange.tv_sec""... $ac_c" 1>&6
-echo "configure:7134: checking for ifnet.if_lastchange.tv_sec" >&5
+echo "configure:7200: checking for ifnet.if_lastchange.tv_sec" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7143,7 +7209,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7147 "configure"
+#line 7213 "configure"
#include "confdefs.h"
@@ -7202,7 +7268,7 @@
; return 0; }
EOF
-if { (eval echo configure:7206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7237,7 +7303,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_obytes""... $ac_c" 1>&6
-echo "configure:7241: checking for ifnet.if_obytes" >&5
+echo "configure:7307: checking for ifnet.if_obytes" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7250,7 +7316,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7254 "configure"
+#line 7320 "configure"
#include "confdefs.h"
@@ -7309,7 +7375,7 @@
; return 0; }
EOF
-if { (eval echo configure:7313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7344,7 +7410,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_ibytes""... $ac_c" 1>&6
-echo "configure:7348: checking for ifnet.if_ibytes" >&5
+echo "configure:7414: checking for ifnet.if_ibytes" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7357,7 +7423,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7361 "configure"
+#line 7427 "configure"
#include "confdefs.h"
@@ -7416,7 +7482,7 @@
; return 0; }
EOF
-if { (eval echo configure:7420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7451,7 +7517,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_addrlist""... $ac_c" 1>&6
-echo "configure:7455: checking for ifnet.if_addrlist" >&5
+echo "configure:7521: checking for ifnet.if_addrlist" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7464,7 +7530,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7468 "configure"
+#line 7534 "configure"
#include "confdefs.h"
@@ -7523,7 +7589,7 @@
; return 0; }
EOF
-if { (eval echo configure:7527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7558,7 +7624,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for ifnet.if_addrhead.tqh_first""... $ac_c" 1>&6
-echo "configure:7562: checking for ifnet.if_addrhead.tqh_first" >&5
+echo "configure:7628: checking for ifnet.if_addrhead.tqh_first" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7571,7 +7637,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7575 "configure"
+#line 7641 "configure"
#include "confdefs.h"
@@ -7630,7 +7696,7 @@
; return 0; }
EOF
-if { (eval echo configure:7634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7665,7 +7731,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for udpstat.udps_discard""... $ac_c" 1>&6
-echo "configure:7669: checking for udpstat.udps_discard" >&5
+echo "configure:7735: checking for udpstat.udps_discard" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7678,7 +7744,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7682 "configure"
+#line 7748 "configure"
#include "confdefs.h"
@@ -7694,7 +7760,7 @@
; return 0; }
EOF
-if { (eval echo configure:7698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7728,7 +7794,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for arphd.at_next""... $ac_c" 1>&6
-echo "configure:7732: checking for arphd.at_next" >&5
+echo "configure:7798: checking for arphd.at_next" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7741,7 +7807,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7745 "configure"
+#line 7811 "configure"
#include "confdefs.h"
@@ -7766,7 +7832,7 @@
; return 0; }
EOF
-if { (eval echo configure:7770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7800,7 +7866,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for swdevt.sw_nblksenabled""... $ac_c" 1>&6
-echo "configure:7804: checking for swdevt.sw_nblksenabled" >&5
+echo "configure:7870: checking for swdevt.sw_nblksenabled" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7813,7 +7879,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7817 "configure"
+#line 7883 "configure"
#include "confdefs.h"
@@ -7829,7 +7895,7 @@
; return 0; }
EOF
-if { (eval echo configure:7833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7863,7 +7929,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for statvfs.f_frsize""... $ac_c" 1>&6
-echo "configure:7867: checking for statvfs.f_frsize" >&5
+echo "configure:7933: checking for statvfs.f_frsize" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7876,7 +7942,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7880 "configure"
+#line 7946 "configure"
#include "confdefs.h"
@@ -7898,7 +7964,7 @@
; return 0; }
EOF
-if { (eval echo configure:7902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7932,7 +7998,7 @@
ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
echo $ac_n "checking for nlist.n_value""... $ac_c" 1>&6
-echo "configure:7936: checking for nlist.n_value" >&5
+echo "configure:8002: checking for nlist.n_value" >&5
if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7945,7 +8011,7 @@
defineit=""
fi
cat > conftest.$ac_ext <<EOF
-#line 7949 "configure"
+#line 8015 "configure"
#include "confdefs.h"
@@ -7961,7 +8027,7 @@
; return 0; }
EOF
-if { (eval echo configure:7965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "${ac_safe_all}=yes"
else
@@ -7989,7 +8055,7 @@
echo $ac_n "checking if sysctl can read kernel information""... $ac_c" 1>&6
-echo "configure:7993: checking if sysctl can read kernel information" >&5
+echo "configure:8059: checking if sysctl can read kernel information" >&5
if eval "test \"`echo '$''{'ac_cv_CAN_USE_SYSCTL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7997,7 +8063,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 8001 "configure"
+#line 8067 "configure"
#include "confdefs.h"
#if TIME_WITH_SYS_TIME
@@ -8035,7 +8101,7 @@
}
EOF
-if { (eval echo configure:8039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_CAN_USE_SYSCTL=yes
else
@@ -8061,7 +8127,7 @@
if test "x$ac_cv_user_prompt_LOGFILE" = "x" -o "x$ac_cv_user_prompt_SYS_LOC" = "x" -o "x$ac_cv_user_prompt_SYS_CONTACT" = "x"; then
echo $ac_n "checking if you have run configure before""... $ac_c" 1>&6
-echo "configure:8065: checking if you have run configure before" >&5
+echo "configure:8131: checking if you have run configure before" >&5
if eval "test \"`echo '$''{'ac_cv_have_warned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8116,7 +8182,7 @@
System Contact Information" | tail -1`
echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
-echo "configure:8120: checking $MSG_CHECK" >&5
+echo "configure:8186: checking $MSG_CHECK" >&5
if eval "test \"`echo '$''{'ac_cv_user_prompt_SYS_CONTACT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8176,7 +8242,7 @@
System Location" | tail -1`
echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
-echo "configure:8180: checking $MSG_CHECK" >&5
+echo "configure:8246: checking $MSG_CHECK" >&5
if eval "test \"`echo '$''{'ac_cv_user_prompt_SYS_LOC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8242,7 +8308,7 @@
Location to write logfile" | tail -1`
echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
-echo "configure:8246: checking $MSG_CHECK" >&5
+echo "configure:8312: checking $MSG_CHECK" >&5
if eval "test \"`echo '$''{'ac_cv_user_prompt_LOGFILE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8307,7 +8373,7 @@
Location to write persistent information" | tail -1`
echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
-echo "configure:8311: checking $MSG_CHECK" >&5
+echo "configure:8377: checking $MSG_CHECK" >&5
if eval "test \"`echo '$''{'ac_cv_user_prompt_PERSISTENT_DIRECTORY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/configure.in b/configure.in
index 826a93d..df05011 100644
--- a/configure.in
+++ b/configure.in
@@ -1000,6 +1000,15 @@
#include <sys/socket.h>
#undef KERNEL
#undef _KERNEL
+], sockaddr, sa_len, no)
+
+AC_CHECK_STRUCT_FOR([
+#include <sys/types.h>
+#define KERNEL
+#define _KERNEL
+#include <sys/socket.h>
+#undef KERNEL
+#undef _KERNEL
#include <net/route.h>
], rtentry, rt_dst, no)
diff --git a/s/bsdi4.h b/s/bsdi4.h
new file mode 100644
index 0000000..878a147
--- /dev/null
+++ b/s/bsdi4.h
@@ -0,0 +1,2 @@
+#include "bsdi.h"
+#define bsdi2 /* bsdi4 is a superset of bsdi2 */
