4 files changed, 46 insertions, 4 deletions
diff --git a/include/config.h b/include/config.h
index a2ced96..92e9916 100644
--- a/include/config.h
+++ b/include/config.h
@@ -20,9 +20,15 @@
 /* Define if you have the bsd library (-lbsd).  */
 /* #undef HAVE_LIBBSD */
 
+/* Define if you have the history library (-lhistory).  */
+#define HAVE_LIBHISTORY 1
+
 /* Define if you have the nsl library (-lnsl).  */
 #define HAVE_LIBNSL 1
 
+/* Define if you have the readline library (-lreadline).  */
+#define HAVE_LIBREADLINE 1
+
 /* Define if you have the rpcsoc library (-lrpcsoc).  */
 /* #undef HAVE_LIBRPCSOC */
 
diff --git a/include/config.h.in b/include/config.h.in
index 5fc2ffd..4932d0a 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -19,9 +19,15 @@
 /* Define if you have the bsd library (-lbsd).  */
 #undef HAVE_LIBBSD
 
+/* Define if you have the history library (-lhistory).  */
+#undef HAVE_LIBHISTORY
+
 /* Define if you have the nsl library (-lnsl).  */
 #undef HAVE_LIBNSL
 
+/* Define if you have the readline library (-lreadline).  */
+#undef HAVE_LIBREADLINE
+
 /* Define if you have the rpcsoc library (-lrpcsoc).  */
 #undef HAVE_LIBRPCSOC
 
diff --git a/include/defs.h b/include/defs.h
index 8733d37..506bfa3 100644
--- a/include/defs.h
+++ b/include/defs.h
@@ -1,6 +1,9 @@
 #ifndef _defs_h_
 #define _defs_h_
 
+/*
+ * NFS related stuff
+ */
 #define MTAB_PATH	"/etc/mtab"
 #ifdef linux
 # define MTAB_TMP	"/etc/mtab~"
@@ -8,8 +11,6 @@
 # define MTAB_TMP	"/etc/mtab.p3nfsd"
 #endif
 
-#define DDEV		"/dev/ttyS0"
-
 #ifdef _IBMR2
 # define DONT_UPDATE_MTAB /* The mount table is obtained from the kernel (!?) */
 #endif
@@ -29,5 +30,19 @@
 #define NO_WRITE_SELECT
 #endif
 
+/*
+ * defaults for ncpd
+ */
+#define DDEV		"/dev/ttyS0"
+#define DSPEED		115200
+#define DPORT		7501
+
+/* Debugging */
+
+#define PACKET_LAYER_DIAGNOSTICS false
+#define LINK_LAYER_DIAGNOSTICS false
+// #define SOCKET_DIAGNOSTICS
+
 #include "config.h"
 #endif
+
diff --git a/include/defs.h.in b/include/defs.h.in
index 9ee654e..221f142 100644
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -1,6 +1,9 @@
 #ifndef _defs_h_
 #define _defs_h_
 
+/*
+ * NFS related stuff
+ */
 #define MTAB_PATH	"@MTAB@"
 #ifdef linux
 # define MTAB_TMP	"@MTAB@~"
@@ -8,8 +11,6 @@
 # define MTAB_TMP	"@MTAB@.p3nfsd"
 #endif
 
-#define DDEV		"@DDEV@"
-
 #ifdef _IBMR2
 # define DONT_UPDATE_MTAB /* The mount table is obtained from the kernel (!?) */
 #endif
@@ -29,5 +30,19 @@
 #define NO_WRITE_SELECT
 #endif
 
+/*
+ * defaults for ncpd
+ */
+#define DDEV		"@DDEV@"
+#define DSPEED		@DSPEED@
+#define DPORT		@DPORT@
+
+/* Debugging */
+
+#define PACKET_LAYER_DIAGNOSTICS false
+#define LINK_LAYER_DIAGNOSTICS false
+// #define SOCKET_DIAGNOSTICS
+
 #include "config.h"
 #endif
+