Remove src/s/hpux11.h

* configure.in (BROKEN_SA_RESTART, USG_SUBTTY_WORKS): New AC_DEFINEs.
(opsysfile): Set specially for hpux11.

* src/s/hpux11.h: Remove file.

4 files changed, 18 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 13512bc13ce..8863a763076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-12  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (BROKEN_SA_RESTART, USG_SUBTTY_WORKS):
+        New AC_DEFINEs, for hpux11.
+        (opsysfile): Set specially for hpux11.
+
 2012-06-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.in: Coalesce some function checking.
diff --git a/configure.in b/configure.in
index 0b4acaa5240..dea8c96591b 100644
--- a/configure.in
+++ b/configure.in
@@ -3125,8 +3125,19 @@ 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-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 bc588517b29..935d9f93c8b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
 2012-06-12  Glenn Morris  <rgm@gnu.org>
 
-        * s/gnu-kfreebsd.h, s/openbsd.h: Remove files.
+        * s/gnu-kfreebsd.h, s/hpux11.h, s/openbsd.h: Remove files.
 
         * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h:
         Move BROKEN_SIGIO to configure.
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
deleted file mode 100644
index 40bcc987973..00000000000
--- a/src/s/hpux11.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "hpux10-20.h"
-
-/* SA_RESTART resets the timeout of `select', so don't use it.  */
-#define BROKEN_SA_RESTART
-
-/* It does work on HPUX to open the pty's tty in the parent (Emacs),
-   then close and reopen it in the child.  */
-#define USG_SUBTTY_WORKS
-