[Emacs-diffs] /srv/bzr/emacs/trunk r109024: Move SIGNALS_VIA_CHARACTERS from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109024
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 00:28:27 -0700
message:
  Move SIGNALS_VIA_CHARACTERS from src/s to configure
  
  * configure.ac (SIGNALS_VIA_CHARACTERS): Move here from src/s.
  
  * src/s/aix4-2.h, src/s/bsd-common.h, src/s/cygwin.h, src/s/gnu-linux.h:
  * src/s/irix6-5.h: Move SIGNALS_VIA_CHARACTERS to configure.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/aix4-2.h
  src/s/bsd-common.h
  src/s/cygwin.h
  src/s/gnu-linux.h
  src/s/irix6-5.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-11 07:23:59 +0000
+++ b/ChangeLog 2012-07-11 07:28:27 +0000
@@ -9,7 +9,7 @@
        * configure.ac (opsysfile): Use bsd-common on gnu systems.
 
        * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT):
-       Move here from src/s.
+       (SIGNALS_VIA_CHARACTERS): Move here from src/s.
 
 2012-07-11  Paul Eggert  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-11 07:23:59 +0000
+++ b/configure.ac      2012-07-11 07:28:27 +0000
@@ -3171,6 +3171,35 @@
 AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DEVICE, "$sound_device",
   [Name of the default sound device.])
 
+
+AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
+"typing" a signal character on the pty.])
+
+case $opsys in
+  dnl Perry Smith <address@hidden> says this is correct for AIX.
+  dnl address@hidden says this is needed for IRIX.
+  aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd )
+    AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
+    ;;
+
+  dnl 21 Jun 06: Eric Hanchrow <address@hidden> says this works. 
+  dnl FIXME Does gnu-kfreebsd have linux/version.h?  It seems unlikely...
+  gnu-linux | gnu-kfreebsd )
+
+    AC_MSG_CHECKING([for signals via characters])
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < 0x20400
+# error "Linux version too old"
+#endif
+      ]], [[]])], emacs_signals_via_chars=yes, emacs_signals_via_chars=no)
+
+    AC_MSG_RESULT([$emacs_signals_via_chars])
+    test $emacs_signals_via_chars = yes && AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
+    ;;
+esac
+
+
 dnl Used in dispnew.c
 AH_TEMPLATE(PENDING_OUTPUT_COUNT, [Number of chars of output in the
 buffer of a stdio stream.])

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 07:20:14 +0000
+++ b/src/ChangeLog     2012-07-11 07:28:27 +0000
@@ -14,6 +14,9 @@
 
 2012-07-11  Glenn Morris  <address@hidden>
 
+       * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h:
+       * s/irix6-5.h: Move SIGNALS_VIA_CHARACTERS to configure.
+
        * 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 CLASH_DETECTION to configure.

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2012-07-11 07:07:19 +0000
+++ b/src/s/aix4-2.h    2012-07-11 07:28:27 +0000
@@ -41,9 +41,6 @@
 /* Special items needed to make Emacs run on this system.  */
 
 /* Perry Smith <address@hidden> says these are correct.  */
-#define SIGNALS_VIA_CHARACTERS
-
-/* Perry Smith <address@hidden> says these are correct.  */
 #undef sigmask
 
 #ifndef HAVE_LIBXMU

=== modified file 'src/s/bsd-common.h'
--- a/src/s/bsd-common.h        2012-07-11 07:07:19 +0000
+++ b/src/s/bsd-common.h        2012-07-11 07:28:27 +0000
@@ -59,6 +59,3 @@
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
-
-/* Send signals to subprocesses by "typing" special chars at them.  */
-#define SIGNALS_VIA_CHARACTERS

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2012-07-11 07:07:19 +0000
+++ b/src/s/cygwin.h    2012-07-11 07:28:27 +0000
@@ -76,6 +76,3 @@
    As malloc is not the Cygwin malloc, the Cygwin memalign always
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
-
-/* Send signals to subprocesses by "typing" special chars at them.  */
-#define SIGNALS_VIA_CHARACTERS

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-11 07:07:19 +0000
+++ b/src/s/gnu-linux.h 2012-07-11 07:28:27 +0000
@@ -25,17 +25,6 @@
 #define USG
 #define GNU_LINUX
 
-#ifdef emacs
-#ifdef HAVE_LINUX_VERSION_H
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= 0x20400
-/* 21 Jun 06: Eric Hanchrow <address@hidden> says this works.  */
-#define SIGNALS_VIA_CHARACTERS
-#endif /* LINUX_VERSION_CODE >= 0x20400 */
-#endif /* HAVE_LINUX_VERSION_H */
-#endif /* emacs */
-
 #if defined HAVE_GRANTPT
 #define UNIX98_PTYS
 

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-07-10 07:15:05 +0000
+++ b/src/s/irix6-5.h   2012-07-11 07:28:27 +0000
@@ -28,10 +28,6 @@
 
 #undef SETUP_SLAVE_PTY
 
-/* address@hidden says this is needed.  */
-/* Make process_send_signal work by "typing" a signal character on the pty.  */
-#define SIGNALS_VIA_CHARACTERS
-
 /* Letter to use in finding device name of first pty,
    if system supports pty's.  'a' means it is /dev/ptya0  */
 #undef FIRST_PTY_LETTER