Get rid of second configuration header defs.h[.in].

Configuration now is in config.h and this is included as the very first header.

1 files changed, 48 insertions, 0 deletions

diff --git a/acconfig.h b/acconfig.h
index 68f0453..5ac67c2 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,3 +1,8 @@
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+@TOP@
+
 /* Define this, if you have libreadline */
 #undef HAVE_LIBREADLINE
 
@@ -7,6 +12,49 @@
 /* Define if the C++ compiler supports BOOL */
 #undef HAVE_BOOL
 
+/* The package version */
 #undef VERSION 
 
+/* The package name */
 #undef PACKAGE
+
+/* Define this to your mtab's path */
+#undef MTAB_PATH
+
+/* Define this to your temporary mtab's path */
+#undef MTAB_TMP
+
+/* Define this to your serial device node */
+#undef DDEV
+
+/* Define this to your serial device speed */
+#undef DSPEED
+
+/* Define this to the TCP port ncpd should listen on */
+#undef DPORT
+
+/* Define this to your default drive on your Psion */
+#undef DDRIVE
+
+/* Define this to your default directory on your Psion */
+#undef DBASEDIR
+
+/* Define this to your default mountpoint for plpnfsd */
+#undef DMOUNTPOINT
+
+@BOTTOM@
+/* Some reasonable defaults */
+
+#ifndef PSIONHOSTNAME
+# define PSIONHOSTNAME "localhost"
+#endif
+
+/* misc tweaks */
+
+#ifdef _IBMR2
+# undef DONT_UPDATE_MTAB
+# define DONT_UPDATE_MTAB /* The mount table is obtained from the kernel (!?) */
+#endif
+
+#endif /* _CONFIG_H_ */
+