- netinet/* include files depend on netinet/in_systm.h.

- Squash bashism in configure.in.

diff --git a/configure.in b/configure.in
index 37f473409117f8de626849d3fd57954cde262a11..f04d065262756eefdf4667c81e8a7f04105bb7cb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.46 2002/06/08 13:46:06 guus Exp $
+dnl $Id: configure.in,v 1.13.2.47 2002/06/08 14:08:56 guus Exp $
 
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
@@ -70,7 +70,7 @@ dnl Checks for libraries.
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h \
+net/ethernet.h net/if.h netinet/in_systm.h netinet/ip.h netinet/tcp.h \
 sys/file.h sys/ioctl.h sys/param.h sys/time.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -88,7 +88,7 @@ AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
   ac_cv_type_socklen_t=yes,
   ac_cv_type_socklen_t=no)
 ])
-if test $ac_cv_type_socklen_t == yes; then
+if test $ac_cv_type_socklen_t = yes; then
   AC_DEFINE(HAVE_SOCKLEN_T)
 fi
 

diff --git a/src/net.c b/src/net.c
index 7ebbbd0f0ba21995228a938b97092bbe3d49551a..9ec15fe17f1767d823dee1a8f758716d96b304bd 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.172 2002/06/08 12:57:09 guus Exp $
+    $Id: net.c,v 1.35.4.173 2002/06/08 14:08:57 guus Exp $
 */
 
 #include "config.h"
@@ -26,6 +26,9 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
 #ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
 #endif

diff --git a/src/net_packet.c b/src/net_packet.c
index 8dac0d9c1da57e680d3d60c21c7718bc682beb28..691260edd072d398fa47035531d851475f8e1a37 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_packet.c,v 1.1.2.15 2002/06/08 12:57:09 guus Exp $
+    $Id: net_packet.c,v 1.1.2.16 2002/06/08 14:08:57 guus Exp $
 */
 
 #include "config.h"
@@ -26,6 +26,9 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
 #ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
 #endif

diff --git a/src/net_setup.c b/src/net_setup.c
index d2a60f0245f324fdbe6f83aaa3e495b1fa4e08fc..d0d57daaa51a9c36e824dda1a470045a6f3f968f 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_setup.c,v 1.1.2.17 2002/06/08 12:57:10 guus Exp $
+    $Id: net_setup.c,v 1.1.2.18 2002/06/08 14:08:57 guus Exp $
 */
 
 #include "config.h"
@@ -26,6 +26,9 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
 #ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
 #endif

diff --git a/src/net_socket.c b/src/net_socket.c
index 74841875d5a827112b1f2150f5dc04e6301e015e..089f007817ad9d90a4c9526b8b5a39676ef7154f 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_socket.c,v 1.1.2.13 2002/06/08 12:57:10 guus Exp $
+    $Id: net_socket.c,v 1.1.2.14 2002/06/08 14:08:57 guus Exp $
 */
 
 #include "config.h"
@@ -26,6 +26,9 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
 #ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
 #endif

diff --git a/src/route.c b/src/route.c
index d2c540b673a04ebec2a59ba4d582f749b56d2642..a552eaf5e96212db649593540d0d309c2cd55234 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: route.c,v 1.1.2.41 2002/06/08 13:46:07 guus Exp $
+    $Id: route.c,v 1.1.2.42 2002/06/08 14:08:57 guus Exp $
 */
 
 #include "config.h"
@@ -33,6 +33,9 @@
 #ifdef HAVE_NET_ETHERNET_H
  #include <net/ethernet.h>
 #endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <netinet/if_ether.h>