summaryrefslogtreecommitdiffstats
path: root/tcpip
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-07 10:24:56 +0200
committerRalf Baechle <ralf@linux-mips.org>1999-06-07 10:24:56 +0200
commit1b4023134b5ff6342301c8135b11df46546d2828 (patch)
tree50dc64182994ea2c13ce23919fa75e64edd4d0f0 /tcpip
parent17287576555a5c46fa23549e2e5f073660dccb70 (diff)
Import ax25-tools 0.0.2 from tarballax25-tools-0.0.2
Diffstat (limited to 'tcpip')
-rw-r--r--tcpip/Makefile.am2
-rw-r--r--tcpip/Makefile.in9
-rw-r--r--tcpip/ttylinkd.c10
3 files changed, 19 insertions, 2 deletions
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"