Move INTERRUPT_INPUT from src/s to configure

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

* src/s/darwin.h, src/s/gnu-linux.h, src/s/template.h:
Move INTERRUPT_INPUT to configure.

diff --git a/ChangeLog b/ChangeLog
index e84ed262adb73dcd1c01c01cea5b9ab324af8bb7..31e14a661e49354066c779e1379d7d29df51c542 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-11  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac (INTERRUPT_INPUT): Move here from src/s.
+
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac (tzset): Remove check that's redundant with gnulib.

diff --git a/configure.ac b/configure.ac
index 106b0a22481392eba7dcc8e986ccdca72a8e0f6f..b6029635e2438eedd0c95c5178b3155e897e23b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3172,6 +3172,34 @@ AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DEVICE, "$sound_device",
   [Name of the default sound device.])
 
 
+dnl Emacs can read input using SIGIO and buffering characters itself,
+dnl or using CBREAK mode and making C-g cause SIGINT.
+dnl The choice is controlled by the variable interrupt_input.
+dnl
+dnl Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
+dnl
+dnl Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros
+dnl to indicate whether or not signal-driven I/O is possible.  It uses
+dnl INTERRUPT_INPUT to decide whether to use it by default.
+dnl
+dnl SIGIO can be used only on systems that implement it (4.2 and 4.3).
+dnl CBREAK mode has two disadvantages
+dnl 1) At least in 4.2, it is impossible to handle the Meta key properly.
+dnl I hear that in system V this problem does not exist.
+dnl 2) Control-G causes output to be discarded.
+dnl I do not know whether this can be fixed in system V.
+dnl
+dnl Another method of doing input is planned but not implemented.
+dnl It would have Emacs fork off a separate process
+dnl to read the input and send it to the true Emacs process
+dnl through a pipe.
+case $opsys in
+  darwin | gnu-linux | gnu-kfreebsd )
+    AC_DEFINE(INTERRUPT_INPUT, 1, [Define to read input using SIGIO.])
+  ;;
+esac
+
+
 AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
 "typing" a signal character on the pty.])
 

diff --git a/src/ChangeLog b/src/ChangeLog
index ae0d7982baedbf6847d0006b6fdc17a99e485e97..5c5f963f61bec7bce5dbdd951fd75670ce834d84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Glenn Morris  <rgm@gnu.org>
+
+       * s/darwin.h, s/gnu-linux.h, s/template.h:
+       Move INTERRUPT_INPUT to configure.
+
 2012-07-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Minor adjustments to interning code.

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 485fadbcb1f2d81c4a2c1f691cdf892509535d92..2a9d52a537ab45a9c0de16925b7451465ab4d26e 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -30,30 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    distinguish OS X from pure Darwin.  */
 #define DARWIN_OS
 
-
-/* Emacs can read input using SIGIO and buffering characters itself,
-   or using CBREAK mode and making C-g cause SIGINT.
-   The choice is controlled by the variable interrupt_input.
-
-   Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
-
-   Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros
-   to indicate whether or not signal-driven I/O is possible.  It uses
-   INTERRUPT_INPUT to decide whether to use it by default.
-
-   SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvantages
-     1) At least in 4.2, it is impossible to handle the Meta key properly.
-        I hear that in system V this problem does not exist.
-     2) Control-G causes output to be discarded.
-        I do not know whether this can be fixed in system V.
-
-   Another method of doing input is planned but not implemented.
-   It would have Emacs fork off a separate process
-   to read the input and send it to the true Emacs process
-   through a pipe. */
-#define INTERRUPT_INPUT
-
 /* Letter to use in finding device name of first pty,
   if system supports pty's.  'a' means it is /dev/ptya0  */
 #define FIRST_PTY_LETTER 'p'

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 463ad226ec1a6f296cd72ceb3ddcc34dd991ce84..b4031bb1ca436db31f3f89d81bf77f0039220411 100644 (file)
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -76,10 +76,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    your system and must be used only through an encapsulation
    (Which you should place, by convention, in sysdep.c).  */
 \f
-#ifdef emacs
-#define INTERRUPT_INPUT
-#endif
-
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
 /* This is to work around mysterious gcc failures in some system versions.

diff --git a/src/s/template.h b/src/s/template.h
index 83027dc591b8e6ccceab7bb9bafc01cd08291882..7f4efee0d1e8ce2e2725af9ab5edef4af71f2b83 100644 (file)
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -29,29 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #define BSD4_2 */
 /* #define BSD_SYSTEM */
 
-/* Emacs can read input using SIGIO and buffering characters itself,
-   or using CBREAK mode and making C-g cause SIGINT.
-   The choice is controlled by the variable interrupt_input.
-
-   Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
-
-   Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros
-   to indicate whether or not signal-driven I/O is possible.  It uses
-   INTERRUPT_INPUT to decide whether to use it by default.
-
-   SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvantages
-     1) At least in 4.2, it is impossible to handle the Meta key properly.
-        I hear that in system V this problem does not exist.
-     2) Control-G causes output to be discarded.
-        I do not know whether this can be fixed in system V.
-
-   Another method of doing input is planned but not implemented.
-   It would have Emacs fork off a separate process
-   to read the input and send it to the true Emacs process
-   through a pipe.  */
-#define INTERRUPT_INPUT
-
 /* Letter to use in finding device name of first pty,
    if system supports pty's.  'a' means it is /dev/ptya0.  */
 #define FIRST_PTY_LETTER 'a'