* configure.in (LIBX11_MACHINE, HAVE_XFREE386): Remove code

dealing with obsolete variables.

* fakemail.c (MAIL_PROGRAM_NAME): Remove unused conditional.
(main): Replace MAIL_PROGRAM_NAME with its value.

* src/Makefile.in:
* src/emacs.c:
* src/gmalloc.c:
* src/keyboard.c:
* src/lisp.h:
* src/m/ibm370aix.h:
* src/process.c:
* src/regex.c:
* src/s/hpux.h:
* src/sysdep.c:
* src/sysselect.h:
* src/systty.h:
* src/unexec.c:
* src/w32term.c:
* src/xsmfns.c:
* src/xterm.c: Remove code that deals with obsolete variables.

* s/msdos.h (DONT_NEED_ENVIRON): Don't define.

* ecrt0.c: Replace the DONT_NEED_ENVIRON test with MSDOS test,
nothing else needs it anymore.

2 files changed, 4 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 8b669dbdcd3..a9d82de9c7e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * fakemail.c (MAIL_PROGRAM_NAME): Remove unused conditional.
+        (main): Replace MAIL_PROGRAM_NAME with its value.
+
         * Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete
         variable.
 
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 10a9cdb20ea..a2d31350fc8 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -135,10 +135,6 @@ struct linebuffer lb;
 #define NIL ((line_list) NULL)
 #define INITIAL_LINE_SIZE 200
 
-#ifndef MAIL_PROGRAM_NAME
-#define MAIL_PROGRAM_NAME "/bin/mail"
-#endif
-
 static char *my_name;
 static char *the_date;
 static char *the_user;
@@ -734,7 +730,7 @@ main (argc, argv)
 
   mail_program_name = getenv ("FAKEMAILER");
   if (!(mail_program_name && *mail_program_name))
-    mail_program_name = MAIL_PROGRAM_NAME;
+    mail_program_name = "/bin/mail";
   name_length = strlen (mail_program_name);
 
   my_name = MY_NAME;