From b4492cba7a034185fecea38790b58c20667bfee0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 12 Jun 2012 15:03:32 -0400 Subject: [PATCH] Remove src/s/sol2-10.h * configure.in (HAVE_PROCFS, _STRUCTURED_PROC): New AC_DEFINEs. (opsysfile): Set specially for sol2-10. * src/s/gnu-linux.h (HAVE_PROCFS): Move to configure. * src/s/sol2-10.h: Remove file. --- ChangeLog | 3 +++ configure.in | 37 +++++++++++++++++++++++++++---------- src/ChangeLog | 4 +++- src/s/gnu-linux.h | 3 --- src/s/sol2-10.h | 10 ---------- 5 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 src/s/sol2-10.h diff --git a/ChangeLog b/ChangeLog index 8863a763076..9a66d00c9e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-06-12 Glenn Morris + * configure.in (HAVE_PROCFS, _STRUCTURED_PROC): New AC_DEFINEs. + (opsysfile): Set specially for sol2-10. + * configure.in (BROKEN_SA_RESTART, USG_SUBTTY_WORKS): New AC_DEFINEs, for hpux11. (opsysfile): Set specially for hpux11. diff --git a/configure.in b/configure.in index dea8c96591b..1f18937dbd9 100644 --- a/configure.in +++ b/configure.in @@ -3125,19 +3125,36 @@ case $opsys in ;; esac -if test "$opsys" = hpux11; then - dnl SA_RESTART resets the timeout of `select', so don't use it. - AC_DEFINE(BROKEN_SA_RESTART, 1, [Define if SA_RESTART should not be used.]) - dnl It works to open the pty's tty in the parent (Emacs), then close - dnl 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.]) -fi +case $opsys in + gnu-* | sol2-10 ) + dnl FIXME Can't we test if this exists (eg /proc/$$)? + AC_DEFINE(HAVE_PROCFS, 1, [Define if you have the /proc filesystem.]) + ;; +esac + +case $opsys in + hpux11) + dnl SA_RESTART resets the timeout of `select', so don't use it. + AC_DEFINE(BROKEN_SA_RESTART, 1, [Define if SA_RESTART should not + be used.]) + 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" + ;; + + sol2-10) + AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes + on Solaris.]) + opsysfile="s/sol2-6.h" + ;; +esac case $opsys in gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; - hpux11) opsysfile="s/hpux10-20.h" ;; openbsd) opsysfile="s/netbsd.h" ;; esac diff --git a/src/ChangeLog b/src/ChangeLog index 935d9f93c8b..cd5c96cf36e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,8 @@ 2012-06-12 Glenn Morris - * s/gnu-kfreebsd.h, s/hpux11.h, s/openbsd.h: Remove files. + * s/gnu-kfreebsd.h, s/hpux11.h, s/openbsd.h, s/sol2-10.h: Remove files. + + * s/gnu-linux.h (HAVE_PROCFS): Move to configure. * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h: Move BROKEN_SIGIO to configure. diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 20ce65207a1..e3d43249d81 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -81,9 +81,6 @@ along with GNU Emacs. If not, see . */ #define HAVE_SOCKETS -/* This is used in list_system_processes. */ -#define HAVE_PROCFS 1 - /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h deleted file mode 100644 index b20476e7fba..00000000000 --- a/src/s/sol2-10.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Handle Solaris 2.10. */ - -#include "sol2-6.h" - -/* This is used in list_system_processes. */ -#define HAVE_PROCFS 1 - -/* This is needed for the system_process_attributes implementation. */ -#define _STRUCTURED_PROC 1 - -- 2.39.5