diff -ruN --exclude-from diff-exclude ax25-apps-0.0.2/INSTALL ax25-apps-0.0.2-bns/INSTALL
--- ax25-apps-0.0.2/INSTALL	Wed Jul  7 08:01:16 1999
+++ ax25-apps-0.0.2-bns/INSTALL	Thu Jul  8 23:56:42 1999
@@ -14,7 +14,9 @@
 
 By default, it will install the files in /usr/local.  To change this
 so that binaries go in  /usr and the conf files go in /etc
-type 'make install --prefix=/usr --sysconfdir=/etc --localstatedir=/var'
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+	make
+	make install
 
 To install the example configuration files type
 	make installconf
diff -ruN --exclude-from diff-exclude ax25-apps-0.0.2/ax25rtd/Makefile.am ax25-apps-0.0.2-bns/ax25rtd/Makefile.am
--- ax25-apps-0.0.2/ax25rtd/Makefile.am	Thu Jul  8 05:34:55 1999
+++ ax25-apps-0.0.2-bns/ax25rtd/Makefile.am	Thu Jul  8 19:45:18 1999
@@ -28,6 +28,6 @@
 AX25_SYSCONFDIR=$(sysconfdir)/ax25/
 AX25_LOCALSTATEDIR=$(localstatedir)/ax25/
 
-INCLUDES = -DAX25_SYSCONFDIR=\""$(ax25_sysconfdir)"\" \
-	   -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" 
+INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
+	   -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" 
 
diff -ruN --exclude-from diff-exclude ax25-apps-0.0.2/call/call.c ax25-apps-0.0.2-bns/call/call.c
--- ax25-apps-0.0.2/call/call.c	Fri Jun  4 05:45:07 1999
+++ ax25-apps-0.0.2-bns/call/call.c	Thu Jul  8 21:27:40 1999
@@ -405,7 +405,7 @@
 {
     static char infostr[80];
     static int y, x;
-    static oldlen;
+    static int oldlen;
     int l, cnt;
 
     if (add) {
@@ -1452,10 +1452,12 @@
 		switch (com_num) {
 		case 0:
 		    {
-#ifdef 0			/* FIXME! We should, no: WE MUST be able to turn off  */
-			/* all remote commands to avoid mail bombs generating */
-			/* offensive mails with //e while sucking the BBS     */
-
+#if 0
+			/*
+			  FIXME! We should, no: WE MUST be able to turn off
+			  all remote commands to avoid mail bombs generating
+			  offensive mails with //e while sucking the BBS
+			*/
 			remotecommand(parms, parmsbytes);
 #endif
 		    }
diff -ruN --exclude-from diff-exclude ax25-apps-0.0.2/configure.in ax25-apps-0.0.2-bns/configure.in
--- ax25-apps-0.0.2/configure.in	Wed Jul  7 07:54:01 1999
+++ ax25-apps-0.0.2-bns/configure.in	Thu Jul  8 22:38:48 1999
@@ -24,22 +24,25 @@
 
 dnl Checks for working glibc 2.1 headers
 AC_MSG_CHECKING(for working netax25/ax25.h header file)
-AC_HEADER_EGREP(ax25_fwd_struct, netax25/ax25.h,AC_DEFINE(HAVE_NETAX25_AX25_H))
-if $HAVE_NETAX25_AX25_H ; then
+AC_HEADER_EGREP(ax25_fwd_struct, netax25/ax25.h, has_ax25=yes, has_ax25=no)
+if test "$has_ax25" = "yes" ; then
+  AC_DEFINE(HAVE_NETAX25_AX25_H)
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
 fi
 AC_MSG_CHECKING(for working netrom/netrom.h header file)
-AC_HEADER_EGREP(unsigned int ndigis, netrom/netrom.h,AC_DEFINE(HAVE_NETROM_NETROM_H))
-if $HAVE_NETROM_NETROM_H ; then
+AC_HEADER_EGREP(unsigned int ndigis, netrom/netrom.h, has_netrom=yes, has_netrom=no)
+if test "$has_netrom" = "yes" ; then
+  AC_DEFINE(HAVE_NETROM_NETROM_H)
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
 fi
 AC_MSG_CHECKING(for working netrose/rose.h header file)
-AC_HEADER_EGREP(rose_facilities_struct, netrose/rose.h,AC_DEFINE(HAVE_NETROSE_ROSE_H))
-if $HAVE_NETROSE_ROSE_H ; then
+AC_HEADER_EGREP(rose_facilities_struct, netrose/rose.h, has_rose=yes, has_rose=no)
+if test "$has_rose" = "yes" ; then
+  AC_DEFINE(HAVE_NETROSE_ROSE_H)
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
@@ -65,5 +68,12 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(gettimeofday mktime select socket strdup strerror strspn strstr strtol strtoul uname)
 
+
+dnl Only use -Wall if we have gcc
+if test "x$GCC" = "xyes"; then
+  if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+    CFLAGS="$CFLAGS -Wall"
+  fi
+fi
 
 AC_OUTPUT(call/Makefile ax25ipd/Makefile listen/Makefile Makefile ax25rtd/Makefile)
diff -ruN --exclude-from diff-exclude ax25-apps-0.0.2/listen/nrdump.c ax25-apps-0.0.2-bns/listen/nrdump.c
--- ax25-apps-0.0.2/listen/nrdump.c	Mon Dec 23 10:39:14 1996
+++ ax25-apps-0.0.2-bns/listen/nrdump.c	Thu Jul  8 21:27:40 1999
@@ -92,7 +92,7 @@
 		break;
 
 	case NR4OPCONRQ:        /* Connect request */
-		lprintf(T_AXHDR, "         conn rqst: ckt %d/%d", data[0], data[1]);
+		lprintf(T_AXHDR, "         conn rqst: my ckt %02X/%02X", data[0], data[1]);
 		lprintf(T_AXHDR, " wnd %d", data[5]);
 		lprintf(T_ADDR, " %s", pax25(tmp, data + 6));
 		lprintf(T_ADDR, "@%s", pax25(tmp, data + 6 + AXLEN));
@@ -104,28 +104,28 @@
 		break;
 
 	case NR4OPCONAK:        /* Connect acknowledgement */
-		lprintf(T_AXHDR,"         conn ack: ur ckt %d/%d my ckt %d/%d", data[0], data[1], data[2], data[3]);
+		lprintf(T_AXHDR,"         conn ack: ur ckt %02X/%02X my ckt %02X/%02X", data[0], data[1], data[2], data[3]);
 		lprintf(T_AXHDR, " wnd %d", data[5]);
 		netrom_flags(data[4]);
 		break;
 
 	case NR4OPDISRQ:        /* Disconnect request */
-		lprintf(T_AXHDR, "         disc: ckt %d/%d\n", data[0], data[1]);
+		lprintf(T_AXHDR, "         disc: ur ckt %02X/%02X\n", data[0], data[1]);
 		break;
 
 	case NR4OPDISAK:        /* Disconnect acknowledgement */
-		lprintf(T_AXHDR, "         disc ack: ckt %d/%d\n", data[0], data[1]);
+		lprintf(T_AXHDR, "         disc ack: ur ckt %02X/%02X\n", data[0], data[1]);
 		break;
 
 	case NR4OPINFO: /* Information (data) */
-		lprintf(T_AXHDR, "         info: ckt %d/%d", data[0], data[1]);
+		lprintf(T_AXHDR, "         info: ur ckt %02X/%02X", data[0], data[1]);
 		lprintf(T_AXHDR, " txseq %d rxseq %d", data[2], data[3]);
 		netrom_flags(data[4]);
 		data_dump(data + 5, length - 5, hexdump);
 		break;
 
 	case NR4OPACK:  /* Information acknowledgement */
-		lprintf(T_AXHDR, "         info ack: ckt %d/%d", data[0], data[1]);
+		lprintf(T_AXHDR, "         info ack: ur ckt %02X/%02X", data[0], data[1]);
 		lprintf(T_AXHDR, " rxseq %d", data[3]);
 		netrom_flags(data[4]);
 		break;