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.

13 files changed, 0 insertions, 55 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index cacfdc7ed63..51ac9748f27 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -26,10 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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++)
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index c2dbdb9a109..ce3d63bb49f 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -46,10 +46,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    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
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9310890351e..9b437341324 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -17,10 +17,6 @@ GNU General Public License for more details.
 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.
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 7c8e26f46cc..5033f91813d 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -31,10 +31,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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.
diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
index a85571915df..f32e6faccd2 100644
--- a/src/s/gnu-kfreebsd.h
+++ b/src/s/gnu-kfreebsd.h
@@ -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> */
-
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 409d0205520..20ce65207a1 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -25,10 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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>
diff --git a/src/s/gnu.h b/src/s/gnu.h
index cd72164a520..089890a12b5 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -21,9 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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.  */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index f1ae50c533a..36227b6ba7b 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -26,10 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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'
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index e5479c3b8d3..7e5a5505ee2 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -26,11 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SETPGRP_RELEASES_CTTY
 
-#ifdef SYSTEM_TYPE
-#undef SYSTEM_TYPE
-#endif
-#define SYSTEM_TYPE "irix"
-
 #ifdef SETUP_SLAVE_PTY
 #undef SETUP_SLAVE_PTY
 #endif
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index f88128b27aa..5bf71d5f321 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -36,10 +36,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    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,
diff --git a/src/s/msdos.h b/src/s/msdos.h
index add2902d5f3..fc1a8c7506a 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -33,10 +33,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #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.  */
diff --git a/src/s/template.h b/src/s/template.h
index 527694bd4bb..d8f811dc8aa 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -30,11 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #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.
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index fabdd66f3bb..d2f3b5d77f5 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -26,10 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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