Create a configuration header file to tidy up command lines.

diff --git a/.cvsignore b/.cvsignore
index 4e44f059212d430d1b784c9fedb1f51b5a88b2d1..3006d5664cf8c082afd499c0f81904ee26bb7633 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,5 @@ Makefile.in
 configure
 aclocal.m4
 build
+config.h.in
+stamp-h.in

diff --git a/acconfig.h b/acconfig.h
new file mode 100644 (file)
index 0000000..23997ec
--- /dev/null
+++ b/acconfig.h
@@ -0,0 +1,71 @@
+/* -*-c-*-
+ *
+ * $Id: acconfig.h,v 1.1 2001/02/04 01:17:54 mdw Exp $
+ *
+ * Configuration header for TrIPE
+ *
+ * (c) 1999 Straylight/Edgeware
+ */
+
+/*----- Licensing notice --------------------------------------------------* 
+ *
+ * This file is part of Trivial IP Encryption (TrIPE).
+ *
+ * TrIPE is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * TrIPE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with TrIPE; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*----- Revision history --------------------------------------------------* 
+ *
+ * $Log: acconfig.h,v $
+ * Revision 1.1  2001/02/04 01:17:54  mdw
+ * Create a configuration header file to tidy up command lines.
+ *
+ */
+
+#ifndef ACCONFIG_H
+#define ACCONFIG_H
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+/*----- Autoconfiguration data --------------------------------------------*/
+@TOP@
+
+/* Package and version number.  */
+#define PACKAGE "tripe"
+#define VERSION "1.0.0"
+
+/* Define to disable the tracing options.  This might improve performance a
+ * little bit, and can prevent sensitive information from being leaked if
+ * you're in the habit of typing things like `tripectl trace A' by
+ * accident. */
+#undef NTRACE
+
+/* Define according to the type of tunneling interface appropriate for your
+ * system.  Linux types should use `TUN_UNET' and build the `usernet'
+ * module.  BSD types should use `TUN_BSD' to use the built-in `tun'
+ * devices. */
+#undef TUN_TYPE
+
+@BOTTOM@
+
+/*----- That's all, folks -------------------------------------------------*/
+
+#ifdef __cplusplus
+  }
+#endif
+
+#endif

diff --git a/client.c b/client.c
index f6517fa494ec7e3857df54fa9079e73e5a7187a7..e78f86e7829fae3e5593c34b38d1b750746506a5 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: client.c,v 1.1 2001/02/03 20:26:37 mdw Exp $
+ * $Id: client.c,v 1.2 2001/02/04 01:17:54 mdw Exp $
  *
  * Client for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: client.c,v $
+ * Revision 1.2  2001/02/04 01:17:54  mdw
+ * Create a configuration header file to tidy up command lines.
+ *
  * Revision 1.1  2001/02/03 20:26:37  mdw
  * Initial checkin.
  *
@@ -36,6 +39,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>

diff --git a/configure.in b/configure.in
index 8e2254ea65c72d0c39a9aaac2710f338ab90adb7..dac4b86ad62e896267534c588dc92c26d03cef02 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.1 2001/02/03 20:26:37 mdw Exp $
+dnl $Id: configure.in,v 1.2 2001/02/04 01:17:54 mdw Exp $
 dnl
 dnl Configuration script for TrIPE
 dnl
@@ -28,16 +28,21 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.2  2001/02/04 01:17:54  mdw
+dnl Create a configuration header file to tidy up command lines.
+dnl
 dnl Revision 1.1  2001/02/03 20:26:37  mdw
 dnl Initial checkin.
 dnl
 
 AC_INIT(tripe.c)
 AM_INIT_AUTOMAKE(tripe, 1.0.0)
+AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
 
 AC_PROG_CC
 mdw_GCC_FLAGS
+mdw_OPT_TRACE
 
 case $host_os in
   linux*)

diff --git a/setup b/setup
index 27dde72e73ab07b3759f67186c11151334b30f54..5173638067dc8c27e6b38aeeb598cd275da8f9bb 100755 (executable)
--- a/setup
+++ b/setup
@@ -3,6 +3,7 @@
 set -e
 mklinks
 mkaclocal
+autoheader
 autoconf
 automake
 mkdir build

diff --git a/tripe.h b/tripe.h
index 40ad1c1ef7e7cd6c4283221adf9a2c0c9e8d6e21..9d46b51ceda6029220c49746bcd3b3c70b32cddd 100644 (file)
--- a/tripe.h
+++ b/tripe.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.h,v 1.2 2001/02/03 22:40:29 mdw Exp $
+ * $Id: tripe.h,v 1.3 2001/02/04 01:17:55 mdw Exp $
  *
  * Main header file for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.h,v $
+ * Revision 1.3  2001/02/04 01:17:55  mdw
+ * Create a configuration header file to tidy up command lines.
+ *
  * Revision 1.2  2001/02/03 22:40:29  mdw
  * Put timer information into the entropy pool when packets are received
  * and on similar events.  Reseed the generator on the interval timer.
@@ -47,6 +50,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>