From 1b4023134b5ff6342301c8135b11df46546d2828 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 7 Jun 1999 10:24:56 +0200
Subject: Import ax25-tools 0.0.2 from tarball

---
 tcpip/Makefile.am |  2 ++
 tcpip/Makefile.in |  9 +++++++--
 tcpip/ttylinkd.c  | 10 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'tcpip')

diff --git a/tcpip/Makefile.am b/tcpip/Makefile.am
index d047ac5..4fbc7e9 100644
--- a/tcpip/Makefile.am
+++ b/tcpip/Makefile.am
@@ -21,3 +21,5 @@ rip98d_SOURCES = 	\
 	rip98t.c	\
 	rip98d.h
 
+rip98d_LDADD = $(AX25_LIB)
+
diff --git a/tcpip/Makefile.in b/tcpip/Makefile.in
index 90da959..84ce5b2 100644
--- a/tcpip/Makefile.in
+++ b/tcpip/Makefile.in
@@ -58,11 +58,15 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AWK = @AWK@
+AX25IO_LIB = @AX25IO_LIB@
+AX25_LIB = @AX25_LIB@
 CC = @CC@
 MAKEINFO = @MAKEINFO@
 NCURSES_LIB = @NCURSES_LIB@
 PACKAGE = @PACKAGE@
+UTIL_LIB = @UTIL_LIB@
 VERSION = @VERSION@
+Z_LIB = @Z_LIB@
 
 etcfiles = rip98.conf ttylinkd.conf
 etcdir = $(sysconfdir)/ax25
@@ -75,6 +79,8 @@ EXTRA_DIST = $(man_MANS) $(etcfiles)
 
 rip98d_SOURCES =  	rip98d.c		rip98r.c		rip98t.c		rip98d.h
 
+
+rip98d_LDADD = $(AX25_LIB)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -90,7 +96,6 @@ X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 rip98d_OBJECTS =  rip98d.o rip98r.o rip98t.o
-rip98d_LDADD = $(LDADD)
 rip98d_DEPENDENCIES = 
 rip98d_LDFLAGS = 
 ttylinkd_SOURCES = ttylinkd.c
@@ -299,7 +304,7 @@ distdir: $(DISTFILES)
 rip98d.o: rip98d.c ../config.h ../pathnames.h rip98d.h
 rip98r.o: rip98r.c rip98d.h
 rip98t.o: rip98t.c rip98d.h
-ttylinkd.o: ttylinkd.c ../pathnames.h
+ttylinkd.o: ttylinkd.c ../config.h ../pathnames.h
 
 info-am:
 info: info-am
diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c
index e185c7e..aeef59a 100644
--- a/tcpip/ttylinkd.c
+++ b/tcpip/ttylinkd.c
@@ -35,6 +35,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <config.h>
+
 #define osockaddr sockaddr
 #include <protocols/talkd.h>
 
@@ -45,8 +47,16 @@
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
 
 #include "../pathnames.h"
 
-- 
cgit v1.2.3