From cca418c9b73f806e50fefbf0fce5644f66e7753d Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Fri, 18 Mar 2016 15:02:59 -0500
Subject: [PATCH] Add --enable-ignore-bogus-ts flag.

This hoists the option out of config.h.
---
 configure.ac          | 14 +++++++++++++-
 include/config.h      |  8 --------
 include/config.h.dist |  8 --------
 include/setup.h.in    |  4 ++++
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 614a01607..77f7a7e0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -502,13 +502,25 @@ dnl Enable oper chghost
 dnl **********************************************************************
 
 AC_ARG_ENABLE(oper-chghost,
-AC_HELP_STRING([--enable-oper-chghost],[Allow opers to use the CHGHOST command]),
+AC_HELP_STRING([--enable-oper-chghost],[Enable opers to use the CHGHOST command]),
 [operchghost=$enableval],[operchghost=no])
 
 if test "$operchghost" = yes; then
 	AC_DEFINE(ENABLE_OPER_CHGHOST, 1, [Define this to enable opers to use the CHGHOST command.])
 fi
 
+dnl **********************************************************************
+dnl Enable ignoring of bogus timestamps
+dnl **********************************************************************
+
+AC_ARG_ENABLE(ignore-bogus-ts,
+AC_HELP_STRING([--enable-ignore-bogus-ts],[Enable the reset of timestamps in channels to current time if set to 0. Set this network wide or not at all.]),
+[ignorebogusts=$enableval],[ignorebogusts=no])
+
+if test "$ignorebogusts" = yes; then
+	AC_DEFINE(IGNORE_BOGUS_TS, 1, [Define this to enable the reset of timestamps in channels to current time if set to 0.])
+fi
+
 dnl Debug-related options
 dnl =====================
 
diff --git a/include/config.h b/include/config.h
index 752d7bfab..e30ad67bf 100644
--- a/include/config.h
+++ b/include/config.h
@@ -64,14 +64,6 @@
 #define OPATH    ETCPATH "/opers.motd"		                   /* oper MOTD file */
 #define DBPATH   PKGLOCALSTATEDIR "/ban.db"                        /* bandb file */
 
-/* IGNORE_BOGUS_TS
- * Ignore bogus timestamps from other servers. Yes this will desync
- * the network, but it will allow chanops to resync with a valid non TS 0
- *
- * This should be enabled network wide, or not at all.
- */
-#undef  IGNORE_BOGUS_TS
-
 /* HANGONGOODLINK and HANGONRETRYDELAY
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY
diff --git a/include/config.h.dist b/include/config.h.dist
index 752d7bfab..e30ad67bf 100644
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -64,14 +64,6 @@
 #define OPATH    ETCPATH "/opers.motd"		                   /* oper MOTD file */
 #define DBPATH   PKGLOCALSTATEDIR "/ban.db"                        /* bandb file */
 
-/* IGNORE_BOGUS_TS
- * Ignore bogus timestamps from other servers. Yes this will desync
- * the network, but it will allow chanops to resync with a valid non TS 0
- *
- * This should be enabled network wide, or not at all.
- */
-#undef  IGNORE_BOGUS_TS
-
 /* HANGONGOODLINK and HANGONRETRYDELAY
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY
diff --git a/include/setup.h.in b/include/setup.h.in
index dca682add..679266bfb 100644
--- a/include/setup.h.in
+++ b/include/setup.h.in
@@ -250,6 +250,10 @@
 /* Prefix where help files are installed. */
 #undef HELP_DIR
 
+/* Define this to enable the reset of timestamps in channels to current time
+   if set to 0. */
+#undef IGNORE_BOGUS_TS
+
 /* Prefix where the ircd is installed. */
 #undef IRCD_PREFIX