9 files changed, 6 insertions, 41 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2dad6bedfcb..eb83ed67017 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-11  Glenn Morris  <rgm@gnu.org>
+
+        * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h, s/gnu-linux.h:
+        * s/hpux10-20.h, s/template.h, s/usg5-4-common.h:
+        Move HAVE_PTYS and HAVE_SOCKETS to configure.
+
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         * s/sol2-6.h (HAVE_LIBKSTAT): Remove.  (Bug#11914)
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 9fd7938f37c..7b7f785954d 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -32,11 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
 #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
 
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-#define HAVE_SOCKETS
 
 /* Special items needed to make Emacs run on this system.  */
 
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 2e25ff63486..aceb45fc63e 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -49,9 +49,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* First pty name is /dev/ptyp0.  */
 #define FIRST_PTY_LETTER 'p'
-
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-#define HAVE_SOCKETS
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 282f9523223..95f0bd79dc9 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -17,8 +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/>.  */
 
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
 #define PTY_ITERATION           int i; for (i = 0; i < 1; i++) /* ick */
 #define PTY_NAME_SPRINTF        /* none */
 #define PTY_TTY_NAME_SPRINTF    /* none */
@@ -46,8 +44,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
-#define HAVE_SOCKETS
-
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
    memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
    As malloc is not the Cygwin malloc, the Cygwin memalign always
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 2a9d52a537a..472f1854219 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -34,9 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   if system supports pty's.  'a' means it is /dev/ptya0  */
 #define FIRST_PTY_LETTER 'p'
 
-/* Define HAVE_PTYS if the system supports pty devices.
-   Note: PTYs are broken on darwin <6.  Use at your own risk.  */
-#define HAVE_PTYS
 /* Run only once.  We need a `for'-loop because the code uses `continue'.  */
 #define PTY_ITERATION   int i; for (i = 0; i < 1; i++)
 #define PTY_NAME_SPRINTF        /* none */
@@ -66,9 +63,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  */
 #define TAB3 OXTABS
 
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-#define HAVE_SOCKETS
-
 /* Definitions for how to compile & link.  */
 #ifdef HAVE_NS
 #define SYSTEM_PURESIZE_EXTRA 200000
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 583a5c5de21..91e8e64b8b5 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -64,11 +64,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #endif  /* not HAVE_GRANTPT */
 
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
-
-#define HAVE_SOCKETS
-
 /* Here, on a separate page, add any special hacks needed
    to make Emacs work on this system.  For example,
    you might define certain system call names that don't
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index ca8bcecb1f9..a7283a8026e 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -30,12 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
 #define FIRST_PTY_LETTER 'p'
 
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-#define HAVE_SOCKETS
-
 /* Special hacks needed to make Emacs run on this system.  */
 
 /* This is how to get the device name of the tty end of a pty.  */
diff --git a/src/s/template.h b/src/s/template.h
index 7f4efee0d1e..832ff9cb438 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -33,9 +33,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    if system supports pty's.  'a' means it is /dev/ptya0.  */
 #define FIRST_PTY_LETTER 'a'
 
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
-
 /* subprocesses should be undefined if you do NOT want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 74f8908c8f9..561b3ad38ec 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -51,9 +51,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    constant to dimension an array.  So wire in the appropriate value here.  */
 #define NSIG_MINIMUM 32
 
-/* Define HAVE_PTYS if the system supports pty devices.  */
-#define HAVE_PTYS
-
 /* It is possible to receive SIGCHLD when there are no children
    waiting, because a previous waitsys(2) cleaned up the carcass of child
    without clearing the SIGCHLD pending info.  So, use a non-blocking
@@ -82,6 +79,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     fatal ("ioctl I_PUSH ldterm");      \
   if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
     fatal ("ioctl I_PUSH ttcompat");
-
-/* This definition was suggested for next release.  So give it a try.  */
-#define HAVE_SOCKETS