Garbage-collect MHRC (and make it the default).

diff --git a/acconfig.h b/acconfig.h
index ce6b5c4d1a2331077362597dd815080f76a825c9..a326761ea976da63067d3f69c02ff8172069cd25 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -25,11 +25,6 @@
  */
 /* #define REALLYDUMB  1 */
 
-/*
- * If this is defined, nmh will recognize the ~ construct.
- */
-#define MHRC    1
-
 /*
  * Compile simple ftp client into mhn.  This will be used by mhn
  * for ftp access unless you have specified another access method

diff --git a/config/config.c b/config/config.c
index b08b3e23a58f6376487a97390f4a7a2f6d7fbfd8..a4edc46545096f3620462eba1b82962503508c7f 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -9,10 +9,7 @@
 
 #include <h/mh.h>
 #include <stdio.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhetcdir(file) NMHETCDIR#file
@@ -35,21 +32,16 @@ etcpath (char *file)
 {
     static char epath[PATH_MAX];
     char *cp;
-#ifdef MHRC
     char *pp;
     struct passwd *pw;
-#endif
 
-#ifdef MHRC
     context_read();
-#endif
 
     switch (*file) {
        case '/': 
            /* If already absolute pathname, return it */
            return file;
 
-#ifdef MHRC
        case '~': 
            /* Expand ~username */
            if ((cp = strchr(pp = file + 1, '/')))
@@ -73,7 +65,6 @@ etcpath (char *file)
            if (access (epath, R_OK) != NOTOK)
                return epath;   /* else fall */
 try_it:
-#endif /* MHRC */
 
        default: 
            /* Check nmh Mail directory */