changeset 557:f486da5f1a3b

[xemacs-hg @ 2001-05-22 06:49:12 by martinb] final part of MacOS X port
author martinb
date Tue, 22 May 2001 06:49:43 +0000
parents 44d2f69c70ad
children ed498ef2108b
files ChangeLog configure.in src/ChangeLog src/config.h.in src/s/darwin.h
diffstat 5 files changed, 44 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 22 06:03:58 2001 +0000
+++ b/ChangeLog	Tue May 22 06:49:43 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-22  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: 
+	If no native dumper (UNEXEC) is defined, simply use pdump.
+	If no SYSTEM_TYPE is defined, choose an appopriate default.
+
 2001-05-10  Paul Stodghill  <stodghil@cs.cornell.edu>
 
 	* configure.in: Reverse the order of Windows and Linux sound tests
--- a/configure.in	Tue May 22 06:03:58 2001 +0000
+++ b/configure.in	Tue May 22 06:49:43 2001 +0000
@@ -1769,7 +1769,9 @@
 CPP_to_sh(LD_SWITCH_MACHINE,  ld_switch_machine)
 CPP_to_sh(LD_SWITCH_SYSTEM,   ld_switch_system)
 
-CPP_to_sh(UNEXEC, unexec, unexec.o)
+CPP_to_sh(UNEXEC, unexec)
+
+CPP_to_sh(SYSTEM_TYPE, system_type)
 
 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c)
 
@@ -1831,6 +1833,17 @@
 
 rm $tempcname
 
+dnl s&m files shouldn't be required to define anything, or even to exist.
+dnl So we default SYSTEM_TYPE to the obvious documented standard, `uname -s`,
+dnl appropriately emacsulated.
+test -z "$system_type" && \
+  AC_DEFINE_UNQUOTED(SYSTEM_TYPE,"`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`")
+
+dnl If the s&m files don't define a system-specific dumper, simply use pdump.
+dnl Sometime in the future, we'll remove all definitions of UNEXEC
+dnl from all the s&m files.
+test -z "$unexec" && pdump=yes
+
 if test "$pdump" = "yes"; then
   ordinary_link="yes"
   ld="${ordinary_ld}"
--- a/src/ChangeLog	Tue May 22 06:03:58 2001 +0000
+++ b/src/ChangeLog	Tue May 22 06:49:43 2001 +0000
@@ -1,3 +1,8 @@
+2001-05-22  Martin Buchholz  <martin@xemacs.org>
+
+	* config.h.in (SYSTEM_TYPE): Allow configure to set this.
+	* s/darwin.h: New.  Add support for MacOS X.
+
 2001-05-20  Mike Alexander  <mta@arbortext.com>
 
 	* device-msw.c (msprinter_init_device): Don't assert out if the
--- a/src/config.h.in	Tue May 22 06:03:58 2001 +0000
+++ b/src/config.h.in	Tue May 22 06:49:43 2001 +0000
@@ -629,6 +629,13 @@
 }
 #endif
 
+/* s&m files shouldn't be required to define anything, or even to exist.
+   If the s&m files don't define SYSTEM_TYPE, configure will select an
+   appropriate default value. */
+#ifndef SYSTEM_TYPE
+#undef SYSTEM_TYPE
+#endif
+
 #if defined (USE_SYSTEM_MALLOC) && !defined (SYSTEM_MALLOC)
 #define SYSTEM_MALLOC
 #endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/s/darwin.h	Tue May 22 06:49:43 2001 +0000
@@ -0,0 +1,12 @@
+/* This is the configuration file for the Apple MacOS X operating system.
+   It's descended from NeXTstep and Freebsd.
+   The system is popularly known as "Darwin".  */
+
+/* This defines the symbol `BSD', which is required for fakemail to
+   compile correctly. */
+#ifndef NOT_C_CODE
+#include <sys/param.h>
+#endif
+
+/* If you don't use the system malloc, you get an obscure link error. */
+#define SYSTEM_MALLOC