From 9d596af370080cba1e67978018d72a836dba008a Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 10 Jul 2012 22:29:13 -0400
Subject: Move DONT_REOPEN_PTY from src/s to configure

* configure.ac (DONT_REOPEN_PTY): Move here from src/s.

* src/s/darwin.h, src/s/freebsd.h, src/s/netbsd.h:
Move DONT_REOPEN_PTY to configure.
---
 ChangeLog       | 2 ++
 configure.ac    | 8 ++++++++
 src/ChangeLog   | 3 +++
 src/s/darwin.h  | 5 -----
 src/s/freebsd.h | 5 -----
 src/s/netbsd.h  | 5 -----
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a67294ea9..b565e4802b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
+	* configure.ac (DONT_REOPEN_PTY): Move here from src/s.
+
 	* configure.ac (DEFAULT_SOUND_DEVICE): New definition.
 
 2012-07-10  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/configure.ac b/configure.ac
index a05f4f860a..214569e985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3145,6 +3145,14 @@ case $opsys in
   ;;
 esac
 
+case $opsys in
+  darwin | freebsd | netbsd | openbsd )
+    AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
+      close a pty to make it a controlling terminal (it is already a
+      controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
+  ;;
+esac
+
 dnl FIXME Surely we can test for this rather than hard-code it.
 case $opsys in
   netbsd | openbsd) sound_device="/dev/audio" ;;
diff --git a/src/ChangeLog b/src/ChangeLog
index be42db2468..244ba0148c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
+	* s/darwin.h, s/freebsd.h, s/netbsd.h:
+	Move DONT_REOPEN_PTY to configure.
+
 	* sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
 	* s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 6b3e680c5d..9371afee5e 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -126,8 +126,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    context as of Darwin 9/Mac OS X 10.5.  */
 #undef HAVE_WORKING_VFORK
 #define vfork fork
-
-/* Don't close pty in process.c to make it as controlling terminal.
-   It is already a controlling terminal of subprocess, because we did
-   ioctl TIOCSCTTY.  */
-#define DONT_REOPEN_PTY
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 04e9a19bdf..b6bd160cc9 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -33,11 +33,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BSD_SYSTEM 199506
 #endif
 
-/* Don't close pty in process.c to make it as controlling terminal.
-   It is already a controlling terminal of subprocess, because we did
-   ioctl TIOCSCTTY.  */
-#define DONT_REOPEN_PTY
-
 /* Circumvent a bug in FreeBSD.  In the following sequence of
    writes/reads on a PTY, read(2) returns bogus data:
 
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 80b4442af5..cbcd54f398 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -26,11 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    that are handled with CPP __RENAME() macro in signal.h.  */
 #include <signal.h>
 
-/* Don't close pty in process.c to make it as controlling terminal.
-   It is already a controlling terminal of subprocess, because we did
-   ioctl TIOCSCTTY.  */
-#define DONT_REOPEN_PTY
-
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
-- 
cgit v1.2.3