Remove all the DEFINE's and the random places they were used for the .conf-based...

diff --git a/include/config.h.dist b/include/config.h.dist
index 04fcfdb160d6edce84b1f123f1d31316a14e42a5..9baeabe411ff0dbf86556e91ede88679f54fac4f 100644 (file)
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -62,10 +62,6 @@
 #define SPATH    BINPATH "/ircd"                  /* ircd executable */
 #define LIPATH   LIBPATH "/libircd" SHARED_SUFFIX  /* ircd library */
 #define CPATH    ETCPATH "/ircd.conf"             /* ircd.conf file */
-#define KPATH    ETCPATH "/kline.conf"            /* kline file */
-#define DLPATH   ETCPATH "/dline.conf"            /* dline file */
-#define XPATH   ETCPATH "/xline.conf"             /* xline file */
-#define RESVPATH ETCPATH "/resv.conf"             /* resv file */
 #define RPATH    ETCPATH "/ircd.rsa"              /* ircd rsa private keyfile */
 #define MPATH    ETCPATH "/ircd.motd"             /* MOTD file */
 #define LPATH    LOGPATH "/ircd.log"              /* ircd logfile */

diff --git a/include/m_info.h b/include/m_info.h
index 8e32da42dc4d43bf6a5f8cd2ae3580f048004e29..0291aef9ed500d1bca12e046ab9d26d30909d48a 100644 (file)
--- a/include/m_info.h
+++ b/include/m_info.h
@@ -51,18 +51,6 @@ Info MyInformation[] = {
        {"DPATH", "NONE", 0, "Directory Containing Configuration Files"},
 #endif /* DPATH */
 
-#ifdef DLPATH
-       {"DLPATH", DLPATH, 0, "Path to D-line File"},
-#else
-       {"DLPATH", "NONE", 0, "Path to D-line File"},
-#endif /* DLPATH */
-
-#ifdef RESVPATH
-       {"RESVPATH", RESVPATH, 0, "Path to resv file"},
-#else
-       {"RESVPATH", "NONE", 0, "Path to resv file"},
-#endif
-
 #ifdef HPATH
        {"HPATH", HPATH, 0, "Path to Operator Help Files"},
 #else
@@ -95,12 +83,6 @@ Info MyInformation[] = {
        {"KILLCHASETIMELIMIT", "", KILLCHASETIMELIMIT,
         "Nick Change Tracker for KILL"},
 
-#ifdef KPATH
-       {"KPATH", KPATH, 0, "Path to K-line File"},
-#else
-       {"KPATH", "NONE", 0, "Path to K-line File"},
-#endif /* KPATH */
-
 #ifdef LPATH
        {"LPATH", LPATH, 0, "Path to Log File"},
 #else

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3ed0073b9dcb09c452596ada04edb93ffc4db082..76ce4b86e6cf76f7089b363968ba1d64e07123d4 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -100,7 +100,6 @@ install: install-mkdirs build
                fi; \
                $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
        done; \
-       $(RM) -f $(DESTDIR)$(bindir)/vimotd $(DESTDIR)$(bindir)/viklines
+       $(RM) -f $(DESTDIR)$(bindir)/vimotd
        $(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/vimotd
-       $(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/viklines
 

diff --git a/tools/viconf.c b/tools/viconf.c
index e18fc359b39eaf39f33de968aed45a0893cef01a..17c7a2710ba2dcbef02a1513b8d257484b6f6bf0 100644 (file)
--- a/tools/viconf.c
+++ b/tools/viconf.c
@@ -43,10 +43,6 @@ int main(int argc, char *argv[])
     p = argv[0];
   else
     p++;
-#ifdef KPATH
-  if(strcmp(p, "viklines") == 0)
-    filename = KPATH;
-#endif /* KPATH */
 
   if(strcmp(p, "vimotd") == 0)
     filename = MPATH;