Remove some cpp that is internal to configure.in.

* configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC):
(USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH): Set with shell, not cpp.
(LIBX): Remove, just use -lX11 in the one place this was used.
(cannot_dump): Replace with CANNOT_DUMP.

* src/Makefile.in (CANNOT_DUMP): Update for configure name change.

* src/s/freebsd.h (USE_MMAP_FOR_BUFFERS):
* src/s/irix6-5.h (USE_MMAP_FOR_BUFFERS):
* src/s/darwin.h (SYSTEM_MALLOC):
* src/s/sol2-10.h (SYSTEM_MALLOC): Move to configure.

* src/m/alpha.h: Remove old comment.
* src/s/aix4-2.h: Update comment.
* src/s/template.h: Remove USE_MMAP_FOR_BUFFERS.

* msdos/sed1v2.inp (CANNOT_DUMP): Update for configure name change.

* admin/CPP-DEFINES: Remove USE_MMAP_FOR_BUFFERS, CANNOT_DUMP.

* etc/DEBUG: Update SYSTEM_MALLOC and CANNOT_DUMP references.
Some re-filling.

6 files changed, 2 insertions, 16 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 48f43126fd9..cf06f9befe0 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -89,8 +89,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    memory use the libc malloc implementation. Calling xfree or
    xrealloc on the results of such functions results in a crash.
 
-   One solution for this could be to define SYSTEM_MALLOC here, but
-   that does not currently work on this system.
+   One solution for this could be to define SYSTEM_MALLOC in configure,
+   but that does not currently work on this system.
 
    It is possible to completely override the malloc implementation on
    AIX, but that involves putting the malloc functions in a shared
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 5c8db1242e1..cd1f9384833 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -114,9 +114,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  */
 #define TAB3 OXTABS
 
-/* Darwin ld insists on the use of malloc routines in the System framework.  */
-#define SYSTEM_MALLOC
-
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index f8d88342621..9082935db07 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -67,9 +67,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
-   buffer text.  This overrides REL_ALLOC.  */
-#define USE_MMAP_FOR_BUFFERS    1
-
 /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
    (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 1691daa6615..e2b18b2ec2b 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -85,8 +85,6 @@ char *_getpty();
 
 #define NARROWPROTO 1
 
-#define USE_MMAP_FOR_BUFFERS 1
-
 #if _MIPS_SZLONG == 64          /* -mabi=64 (gcc) or -64 (MIPSpro) */
 #define _LP64                   /* lisp.h takes care of the rest */
 #endif /* _MIPS_SZLONG */
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
index 7441eaa0210..fd7f30021ea 100644
--- a/src/s/sol2-10.h
+++ b/src/s/sol2-10.h
@@ -2,8 +2,6 @@
 
 #include "sol2-6.h"
 
-#define SYSTEM_MALLOC
-
 /* This is used in list_system_processes.  */
 #define HAVE_PROCFS 1
 
diff --git a/src/s/template.h b/src/s/template.h
index 694a1046566..67ed13e6180 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -108,9 +108,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    is not ':', #define this to be the appropriate character constant.  */
 /* #define SEPCHAR ':' */
 
-/* Define this if the system can use mmap for buffer text allocation.  */
-/* #define USE_MMAP_FOR_BUFFERS 1 */
-
 /* ============================================================ */
 
 /* Here, add any special hacks needed to make Emacs work on this