From 7ccad0028b6c1ee6c694332f70cb067a8169ab1e Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 11 Jul 2012 21:49:28 -0400
Subject: Move more stuff from src/s to configure

* configure.ac (PREFER_VSUSP, RUN_TIME_REMAP, SETPGRP_RELEASES_CTTY)
(TAB3, TABDLY, RUN_TIME_REMAP, XOS_NEEDS_TIME_H): Move here from src/s.

* src/s/bsd-common.h, src/s/darwin.h: Move TAB3 to configure.

* src/s/hpux10-20.h, src/s/sol2-6.h: Move XOS_NEEDS_TIME_H to configure.

* src/s/irix6-5.h (SETPGRP_RELEASES_CTTY, PREFER_VSUSP):
* src/s/hpux10-20.h (RUN_TIME_REMAP):
* src/s/bsd-common.h (TABDLY): Move to configure.
---
 src/s/bsd-common.h | 3 ---
 src/s/darwin.h     | 3 ---
 src/s/hpux10-20.h  | 5 -----
 src/s/irix6-5.h    | 5 -----
 src/s/sol2-6.h     | 3 ---
 5 files changed, 19 deletions(-)

(limited to 'src/s')

diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 0fa6d146479..901ed0c490e 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -37,8 +37,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* For mem-limits.h.  */
 #define BSD4_2
 
-#define TABDLY OXTABS
-#define TAB3 OXTABS
-
 /* First pty name is /dev/ptyp0.  */
 #define FIRST_PTY_LETTER 'p'
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 548e3b4779e..7b4b5e196e3 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -60,9 +60,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    also the name of a Mach system call.  */
 #define init_process emacs_init_process
 
-/* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  */
-#define TAB3 OXTABS
-
 /* Definitions for how to compile & link.  */
 #ifdef HAVE_NS
 #define SYSTEM_PURESIZE_EXTRA 200000
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index a7283a8026e..47908c9a4c0 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -18,8 +18,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/>.  */
 
 
-#define RUN_TIME_REMAP
-
 /* Define symbols to identify the version of Unix this is.
    Define all the symbols that apply correctly.  */
 #define USG				/* System III, System V, etc */
@@ -40,9 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PTY_NAME_SPRINTF \
 	sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);
 
-/* This triggers a conditional in xfaces.c.  */
-#define XOS_NEEDS_TIME_H
-
 /* Assar Westerlund <assar@sics.se> says this is necessary for
    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
 #define NO_EDITRES
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index cd06af7c2bb..dd7a00d0ba7 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -24,8 +24,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef _longjmp /* use system versions, not conservative aliases */
 #undef _setjmp
 
-#define SETPGRP_RELEASES_CTTY
-
 #undef SETUP_SLAVE_PTY
 
 /* Letter to use in finding device name of first pty,
@@ -67,9 +65,6 @@ char *_getpty();
 /* Ulimit(UL_GMEMLIM) is busted...  */
 #define ULIMIT_BREAK_VALUE 0x14000000
 
-/* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
-#define PREFER_VSUSP
-
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
 
 #undef TIOCSIGSEND		/* defined in usg5-4-common.h */
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 6a7c261054f..e77d9e5a901 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -21,9 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SOLARIS2
 
-/* This triggers a conditional in xfaces.c.  */
-#define XOS_NEEDS_TIME_H
-
 /* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock
    rather than sighold/sigrelse, which appear to be BSD4.1 specific.
    It may also be appropriate for SVR4.x
-- 
cgit v1.2.1