Support new files (node/vertex/device.[ch]) and OpenBSD.

diff --git a/acconfig.h b/acconfig.h
index 7bb8efe..aa078c9 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -50,6 +50,9 @@
 /* FreeBSD */
 #undef HAVE_FREEBSD
 
 /* FreeBSD */
 #undef HAVE_FREEBSD
 

+/* OpenBSD */
+#undef HAVE_OPENBSD
+

 /* Solaris */
 #undef HAVE_SOLARIS
 
 /* Solaris */
 #undef HAVE_SOLARIS
 

diff --git a/configure.in b/configure.in
index 1ca2f79..c0db8d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Process this file with autoconf to produce a configure script.
 

-dnl $Id: configure.in,v 1.13.2.34 2001/06/29 10:27:57 guus Exp $
+dnl $Id: configure.in,v 1.13.2.35 2001/10/13 13:53:07 guus Exp $

 
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
 
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)


@@ -36,12 +36,19 @@ AC_CANONICAL_HOST
 case $host_os in
   *linux*)
     AC_DEFINE(HAVE_LINUX)
 case $host_os in
   *linux*)
     AC_DEFINE(HAVE_LINUX)

+    [ ln -sf linux/device.c src/device.c ]

   ;;
   *freebsd*)
     AC_DEFINE(HAVE_FREEBSD)
   ;;
   *freebsd*)
     AC_DEFINE(HAVE_FREEBSD)

+    [ ln -sf freebsd/device.c src/device.c ]

   ;;
   *solaris*)
     AC_DEFINE(HAVE_SOLARIS)
   ;;
   *solaris*)
     AC_DEFINE(HAVE_SOLARIS)

+    [ ln -sf solaris/device.c src/device.c ]
+  ;;
+  *openbsd*)
+    AC_DEFINE(HAVE_OPENBSD)
+    [ ln -sf openbsd/device.c src/device.c ]

   ;;
 esac
 
   ;;
 esac
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 73b40de..862f732 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 ## Produce this file with automake to get Makefile.in
 ## Produce this file with automake to get Makefile.in

-# $Id: Makefile.am,v 1.4.4.13 2001/03/04 13:59:25 guus Exp $
+# $Id: Makefile.am,v 1.4.4.14 2001/10/13 13:53:07 guus Exp $

 
 sbin_PROGRAMS = tincd
 
 
 sbin_PROGRAMS = tincd
 

-tincd_SOURCES = conf.c connection.c meta.c net.c netutl.c process.c    \
-       protocol.c route.c subnet.c tincd.c
+tincd_SOURCES = conf.c connection.c device.c meta.c net.c netutl.c node.c process.c    \
+       protocol.c route.c subnet.c tincd.c vertex.c

 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 

-noinst_HEADERS = conf.h connection.h meta.h net.h netutl.h process.h   \
-       protocol.h route.h subnet.h
+noinst_HEADERS = conf.h connection.h device.h meta.h net.h netutl.h node.h process.h   \
+       protocol.h route.h subnet.h vertex.h

 
 LIBS = @LIBS@ @INTLLIBS@
 
 
 LIBS = @LIBS@ @INTLLIBS@