[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108566: Move SYSTEM_TYPE from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 108566
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-06-11 19:17:11 -0400
message:
  Move SYSTEM_TYPE from src/s to configure
  
  * configure.in (SYSTEM_TYPE): New AC_DEFINE.
  
  * msdos/sed2v2.inp (SYSTEM_TYPE): Set it.
  
  * nt/config.nt (SYSTEM_TYPE): Define it.
  
  * src/s/aix4-2.h, src/s/bsd-common.h, src/s/cygwin.h, src/s/darwin.h:
  * src/s/gnu-kfreebsd.h, src/s/gnu-linux.h, src/s/gnu.h, src/s/hpux10-20.h:
  * src/s/irix6-5.h, src/s/ms-w32.h, src/s/msdos.h, src/s/template.h:
  * src/s/usg5-4-common.h: Remove SYSTEM_TYPE.
modified:
  ChangeLog
  configure.in
  msdos/ChangeLog
  msdos/sed2v2.inp
  nt/ChangeLog
  nt/config.nt
  src/ChangeLog
  src/s/aix4-2.h
  src/s/bsd-common.h
  src/s/cygwin.h
  src/s/darwin.h
  src/s/gnu-kfreebsd.h
  src/s/gnu-linux.h
  src/s/gnu.h
  src/s/hpux10-20.h
  src/s/irix6-5.h
  src/s/ms-w32.h
  src/s/msdos.h
  src/s/template.h
  src/s/usg5-4-common.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-06-10 13:20:58 +0000
+++ b/ChangeLog 2012-06-11 23:17:11 +0000
@@ -1,3 +1,7 @@
+2012-06-11  Glenn Morris  <address@hidden>
+
+       * configure.in (SYSTEM_TYPE): New AC_DEFINE.
+
 2012-06-09  Michael Albinus  <address@hidden>
 
        * configure.in (dbus_type_is_valid): Check for library function.

=== modified file 'configure.in'
--- a/configure.in      2012-06-10 13:20:58 +0000
+++ b/configure.in      2012-06-11 23:17:11 +0000
@@ -934,6 +934,11 @@
 LIB_MATH=-lm
 LIB_STANDARD=
 START_FILES=
+dnl Current possibilities handled by sed (aix4-2 -> aix,
+dnl gnu-linux -> gnu/linux, etc.):
+dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux, irix.
+dnl And special cases: berkeley-unix, usg-unix-v, ms-dos, windows-nt.
+SYSTEM_TYPE=`echo $opsys | sed -e 's/[0-9].*//' -e 's|-|/|'`
 
 dnl NB do not use CRT_DIR unquoted here, since it might not be set yet.
 case $opsys in
@@ -949,6 +954,7 @@
   freebsd )
     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
     START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o 
$(CRT_DIR)/crtbegin.o'
+    SYSTEM_TYPE=berkeley-unix
     ;;
   gnu-linux | gnu-kfreebsd )
     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
@@ -962,11 +968,19 @@
   netbsd | openbsd )
     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'
     START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o'
-    ;;
+    SYSTEM_TYPE=berkeley-unix
+    ;;
+
+  sol2* | unixware )
+    SYSTEM_TYPE=usg-unix-v
+    ;;
+
 esac
 
 AC_SUBST(LIB_MATH)
 AC_SUBST(START_FILES)
+AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE",
+  [The type of system you are compiling for; sets `system-type'.])
 
 dnl Not all platforms use crtn.o files.  Check if the current one does.
 crt_files=

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-06-10 13:20:58 +0000
+++ b/msdos/ChangeLog   2012-06-11 23:17:11 +0000
@@ -1,3 +1,7 @@
+2012-06-11  Glenn Morris  <address@hidden>
+
+       * sed2v2.inp (SYSTEM_TYPE): Set it.
+
 2012-05-27  Eli Zaretskii  <address@hidden>
 
        * sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)

=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp  2012-06-10 13:20:58 +0000
+++ b/msdos/sed2v2.inp  2012-06-11 23:17:11 +0000
@@ -59,6 +59,7 @@
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
 /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
 /^#undef VERSION/s/^.*$/#define VERSION "24.1.50"/
+/^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
 /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-06-10 13:20:58 +0000
+++ b/nt/ChangeLog      2012-06-11 23:17:11 +0000
@@ -1,3 +1,7 @@
+2012-06-11  Glenn Morris  <address@hidden>
+
+       * config.nt (SYSTEM_TYPE): Define it.
+
 2012-05-31  Eli Zaretskii  <address@hidden>
 
        * configure.bat (genmakefiles): Move the redirection away from the

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-06-10 13:20:58 +0000
+++ b/nt/config.nt      2012-06-11 23:17:11 +0000
@@ -326,6 +326,9 @@
 /* Version number of package */
 #define VERSION "24.1.50"
 
+/* The type of system you are compiling for; sets `system-type'.  */
+#define SYSTEM_TYPE "windows-nt"
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifdef __GNUC__

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-11 15:13:27 +0000
+++ b/src/ChangeLog     2012-06-11 23:17:11 +0000
@@ -1,3 +1,10 @@
+2012-06-11  Glenn Morris  <address@hidden>
+
+       * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h:
+       * s/gnu-kfreebsd.h, s/gnu-linux.h, s/gnu.h, s/hpux10-20.h:
+       * s/irix6-5.h, s/ms-w32.h, s/msdos.h, s/template.h:
+       * s/usg5-4-common.h: Move SYSTEM_TYPE to configure.
+
 2012-06-11  Stefan Monnier  <address@hidden>
 
        * alloc.c (make_byte_code): New function.

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2012-05-22 16:20:27 +0000
+++ b/src/s/aix4-2.h    2012-06-11 23:17:11 +0000
@@ -26,10 +26,6 @@
 #define _AIX
 #endif
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "aix"
-
 /* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
    To get the name of the slave side, you just ttyname() the master side.  */
 #define PTY_ITERATION int c; for (c = 0; !c ; c++)

=== modified file 'src/s/bsd-common.h'
--- a/src/s/bsd-common.h        2012-01-19 07:21:25 +0000
+++ b/src/s/bsd-common.h        2012-06-11 23:17:11 +0000
@@ -46,10 +46,6 @@
    for X functions taking float or double parameters.  */
 #define NARROWPROTO 1
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "berkeley-unix"
-
 /* Do not use interrupt_input = 1 by default, because in 4.3
    we can make noninterrupt input work properly.  */
 #undef INTERRUPT_INPUT

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2012-04-14 06:18:49 +0000
+++ b/src/s/cygwin.h    2012-06-11 23:17:11 +0000
@@ -17,10 +17,6 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "cygwin"
-
 /* Emacs can read input using SIGIO and buffering characters itself,
    or using CBREAK mode and making C-g cause SIGINT.
    The choice is controlled by the variable interrupt_input.

=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h    2012-04-14 06:18:49 +0000
+++ b/src/s/darwin.h    2012-06-11 23:17:11 +0000
@@ -31,10 +31,6 @@
 #define DARWIN_OS
 
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "darwin"
-
 /* Emacs can read input using SIGIO and buffering characters itself,
    or using CBREAK mode and making C-g cause SIGINT.
    The choice is controlled by the variable interrupt_input.

=== modified file 'src/s/gnu-kfreebsd.h'
--- a/src/s/gnu-kfreebsd.h      2011-01-15 23:16:57 +0000
+++ b/src/s/gnu-kfreebsd.h      2012-06-11 23:17:11 +0000
@@ -1,9 +1,3 @@
 #include "gnu-linux.h"
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "gnu/kfreebsd" /* All the best software is free */
-
 #define NO_TERMIO               /* use only <termios.h> */
-

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-05-22 16:20:27 +0000
+++ b/src/s/gnu-linux.h 2012-06-11 23:17:11 +0000
@@ -25,10 +25,6 @@
 #define USG
 #define GNU_LINUX
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "gnu/linux"                /* All the best software is 
free. */
-
 #ifdef emacs
 #ifdef HAVE_LINUX_VERSION_H
 #include <linux/version.h>

=== modified file 'src/s/gnu.h'
--- a/src/s/gnu.h       2012-05-22 16:20:27 +0000
+++ b/src/s/gnu.h       2012-06-11 23:17:11 +0000
@@ -21,9 +21,6 @@
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"
 
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "gnu"
-
 #define SIGNALS_VIA_CHARACTERS
 
 /* libc defines data_start.  */

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2012-05-31 05:08:37 +0000
+++ b/src/s/hpux10-20.h 2012-06-11 23:17:11 +0000
@@ -26,10 +26,6 @@
 #define USG5
 #define HPUX
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "hpux"
-
 /* Letter to use in finding device name of first pty,
    if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
 #define FIRST_PTY_LETTER 'p'

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-05-22 16:20:27 +0000
+++ b/src/s/irix6-5.h   2012-06-11 23:17:11 +0000
@@ -26,11 +26,6 @@
 
 #define SETPGRP_RELEASES_CTTY
 
-#ifdef SYSTEM_TYPE
-#undef SYSTEM_TYPE
-#endif
-#define SYSTEM_TYPE "irix"
-
 #ifdef SETUP_SLAVE_PTY
 #undef SETUP_SLAVE_PTY
 #endif

=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h    2012-05-22 16:20:27 +0000
+++ b/src/s/ms-w32.h    2012-06-11 23:17:11 +0000
@@ -36,10 +36,6 @@
    convention must be whatever standard the libraries expect.  */
 #define _CALLBACK_ __cdecl
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "windows-nt"
-
 #define NO_MATHERR 1
 
 /* Letter to use in finding device name of first pty,

=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h     2012-04-14 06:18:49 +0000
+++ b/src/s/msdos.h     2012-06-11 23:17:11 +0000
@@ -33,10 +33,6 @@
 #define DOS_NT /* MSDOS or WINDOWSNT */
 #undef BSD_SYSTEM
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "ms-dos"
-
 /* subprocesses should be defined if you want to have code for
    asynchronous subprocesses (as used in M-x compile and M-x shell).
    This is the only system that needs this.  */

=== modified file 'src/s/template.h'
--- a/src/s/template.h  2012-01-19 07:21:25 +0000
+++ b/src/s/template.h  2012-06-11 23:17:11 +0000
@@ -30,11 +30,6 @@
 /* #define BSD4_3 */
 /* #define BSD_SYSTEM */
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-
-#define SYSTEM_TYPE "berkeley-unix"
-
 /* Emacs can read input using SIGIO and buffering characters itself,
    or using CBREAK mode and making C-g cause SIGINT.
    The choice is controlled by the variable interrupt_input.

=== modified file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h     2012-01-19 07:21:25 +0000
+++ b/src/s/usg5-4-common.h     2012-06-11 23:17:11 +0000
@@ -26,10 +26,6 @@
 #define USG5
 #define USG5_4
 
-/* SYSTEM_TYPE should indicate the kind of system you are using.
-   It sets the Lisp variable system-type.  */
-#define SYSTEM_TYPE "usg-unix-v"
-
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
 #define _setjmp setjmp