diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/s/bsd-common.h | 2 | ||||
| -rw-r--r-- | src/s/darwin.h | 2 | ||||
| -rw-r--r-- | src/s/gnu-kfreebsd.h | 1 | ||||
| -rw-r--r-- | src/s/hpux10-20.h | 6 | ||||
| -rw-r--r-- | src/s/openbsd.h | 4 | ||||
| -rw-r--r-- | src/s/usg5-4-common.h | 4 |
9 files changed, 25 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index 5f19b1cba44..da39ee2e48d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ 2012-06-12 Glenn Morris <rgm@gnu.org> + * configure.in (NO_TERMIO, BROKEN_SIGIO): Move here from src/s. + * configure.in: Anticipate platforms with no src/s file. 2012-06-12 Chong Yidong <cyd@gnu.org> diff --git a/configure.in b/configure.in index 3ba3e184579..2750ccdcd54 100644 --- a/configure.in +++ b/configure.in @@ -3111,6 +3111,20 @@ dnl and macros for terminal control.]) dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetattr.]) dnl fi +case $opsys in + darwin | gnu | hpux* | *bsd ) + AC_DEFINE(NO_TERMIO, 1, [Define if termio.h should not be included.]) + ;; +esac + +dnl SIGIO exists, but the feature doesn't work in the way Emacs needs. +dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>. +case $opsys in + hpux* | irix6-5 | openbsd | sol2* | unixware ) + AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO should not be used.]) + ;; +esac + # Set up the CFLAGS for real compilation, so we can substitute it. CFLAGS="$REAL_CFLAGS" CPPFLAGS="$REAL_CPPFLAGS" diff --git a/src/ChangeLog b/src/ChangeLog index 3a011fc7432..2c5bf632bdb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2012-06-12 Glenn Morris <rgm@gnu.org> + + * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h: + Move BROKEN_SIGIO to configure. + + * s/bsd-common.h, s/darwin.h, s/gnu-kfreebsd.h, s/hpux10-20.h: + Move NO_TERMIO to configure. + 2012-06-12 Chong Yidong <cyd@gnu.org> * image.c (imagemagick_load_image): Use MagickFlattenImage if diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index ce3d63bb49f..ce67dd7b9af 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -37,8 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define TABDLY OXTABS #define TAB3 OXTABS -#define NO_TERMIO - /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is generated in the Makefile generated by `xmkmf'. If we don't diff --git a/src/s/darwin.h b/src/s/darwin.h index 5033f91813d..ce86bc5f578 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -58,8 +58,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 NO_TERMIO - /* Define HAVE_PTYS if the system supports pty devices. Note: PTYs are broken on darwin <6. Use at your own risk. */ #define HAVE_PTYS diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h index f32e6faccd2..c1e5de5c7a7 100644 --- a/src/s/gnu-kfreebsd.h +++ b/src/s/gnu-kfreebsd.h @@ -1,3 +1,2 @@ #include "gnu-linux.h" -#define NO_TERMIO /* use only <termios.h> */ diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 36227b6ba7b..683837891f4 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -30,8 +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 NO_TERMIO - /* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS @@ -45,10 +43,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Special hacks needed to make Emacs run on this system. */ -/* In hpux, the symbol SIGIO is defined, but the feature - doesn't work in the way Emacs needs it to. */ -#define BROKEN_SIGIO - /* Some additional system facilities exist. */ #define HAVE_PERROR /* Delete this line for version 6. */ diff --git a/src/s/openbsd.h b/src/s/openbsd.h index 0a8bab2290f..8c44cf65cc6 100644 --- a/src/s/openbsd.h +++ b/src/s/openbsd.h @@ -3,7 +3,3 @@ /* Nearly the same as NetBSD. Note there are differences in configure. */ #include "netbsd.h" -/* The symbol SIGIO is defined, but the feature doesn't work in the - way Emacs needs it to. See - <http://article.gmane.org/gmane.os.openbsd.ports/46831>. */ -#define BROKEN_SIGIO diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h index d2f3b5d77f5..02c43814678 100644 --- a/src/s/usg5-4-common.h +++ b/src/s/usg5-4-common.h @@ -35,8 +35,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define HAVE_SYSV_SIGPAUSE /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. - But get <termio.h> first to make sure ttold.h doesn't interfere. - And don't try to use SIGIO yet. */ + But get <termio.h> first to make sure ttold.h doesn't interfere. */ #include <sys/wait.h> #ifdef emacs @@ -47,7 +46,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/stream.h> #include <sys/stropts.h> #include <sys/termios.h> -#define BROKEN_SIGIO #endif /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; |