Commit 7ccad002 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent ea0bbd17
......@@ -3,8 +3,10 @@
* configure.ac (NO_MATHERR): Unconditionally define for Darwin;
as src/s/darwin.h used to.
* configure.ac (NARROWPROTO, NO_ABORT, BROKEN_FIONREAD, BROKEN_SIGAIO):
(BROKEN_SIGPOLL, BROKEN_SIGPTY): Move here from src/s.
* configure.ac (NARROWPROTO, NO_ABORT, BROKEN_FIONREAD, BROKEN_SIGAIO)
(BROKEN_SIGPOLL, BROKEN_SIGPTY, PREFER_VSUSP, RUN_TIME_REMAP)
(SETPGRP_RELEASES_CTTY, TAB3, TABDLY, RUN_TIME_REMAP
(XOS_NEEDS_TIME_H): Move here from src/s.
2012-07-11 Glenn Morris <rgm@gnu.org>
......
......@@ -3365,33 +3365,67 @@ case $opsys in
;;
esac
AH_TEMPLATE(TAB3, [Undocumented.])
case $opsys in
gnu) opsysfile="s/bsd-common.h" ;;
gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
hpux11)
dnl See comments in sysdep.c:sys_signal.
dnl SA_RESTART resets the timeout of `select' on hpux11.
dnl Defining BROKEN_SA_RESTART is not the same as undef'ing SA_RESTART.
AC_DEFINE(BROKEN_SA_RESTART, 1, [Define if SA_RESTART should only
be used in batch mode.])
dnl It works to open the pty's tty in the parent (Emacs), then
dnl close and reopen it in the child.
AC_DEFINE(USG_SUBTTY_WORKS, 1, [Define for USG systems where it
works to open a pty's tty in the parent process, then close and
reopen it in the child.])
opsysfile="s/hpux10-20.h"
;;
darwin) AC_DEFINE(TAB3, OXTABS) ;;
openbsd) opsysfile="s/netbsd.h" ;;
gnu | freebsd | netbsd | openbsd )
AC_DEFINE(TABDLY, OXTABS, [Undocumented.] )
AC_DEFINE(TAB3, OXTABS)
;;
sol2-10)
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
on Solaris.])
opsysfile="s/sol2-6.h"
;;
hpux*)
AC_DEFINE(RUN_TIME_REMAP, 1, [Define if emacs.c needs to call
run_time_remap; for HPUX.])
;;
esac
dnl Used in xfaces.c.
case $opsys in
hpux* | sol2* )
AC_DEFINE(XOS_NEEDS_TIME_H, 1, [Compensate for a bug in Xos.h on
some systems, where it requires time.h.])
;;
esac
case $opsys in
gnu) opsysfile="s/bsd-common.h" ;;
gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
hpux11)
dnl See comments in sysdep.c:sys_signal.
dnl SA_RESTART resets the timeout of `select' on hpux11.
dnl Defining BROKEN_SA_RESTART is not the same as undef'ing SA_RESTART.
AC_DEFINE(BROKEN_SA_RESTART, 1, [Define if SA_RESTART should only
be used in batch mode.])
dnl It works to open the pty's tty in the parent (Emacs), then
dnl close and reopen it in the child.
AC_DEFINE(USG_SUBTTY_WORKS, 1, [Define for USG systems where it
works to open a pty's tty in the parent process, then close and
reopen it in the child.])
opsysfile="s/hpux10-20.h"
;;
irix6-5)
AC_DEFINE(PREFER_VSUSP, 1, [Define if process_send_signal should
use VSUSP instead of VSWTCH.])
AC_DEFINE(SETPGRP_RELEASES_CTTY, 1, [Define if process.c:child_setup
should not call setpgrp.])
;;
openbsd) opsysfile="s/netbsd.h" ;;
sol2-10)
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
on Solaris.])
opsysfile="s/sol2-6.h"
;;
esac
# Set up the CFLAGS for real compilation, so we can substitute it.
......
2012-07-12 Glenn Morris <rgm@gnu.org>
 
* s/irix6-5.h (SETPGRP_RELEASES_CTTY, PREFER_VSUSP):
* s/hpux10-20.h (RUN_TIME_REMAP):
* s/bsd-common.h (TABDLY): Move to configure.
* s/hpux10-20.h, s/sol2-6.h: Move XOS_NEEDS_TIME_H to configure.
* s/bsd-common.h, s/darwin.h: Move TAB3 to configure.
* s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
(BROKEN_SIGPOLL): Let configure set them.
 
......
......@@ -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'
......@@ -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
......
......@@ -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
......
......@@ -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 */
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment