procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move NO_TERMIO, BROKEN_SIGIO from src/s to configure

Browse source 
* configure.in (NO_TERMIO, BROKEN_SIGIO): New AC_DEFINEs.

* src/s/bsd-common.h, src/s/darwin.h, src/s/gnu-kfreebsd.h, src/s/hpux10-20.h:
Remove NO_TERMIO.

* src/s/hpux10-20.h, src/s/openbsd.h, src/s/usg5-4-common.h:
Remove BROKEN_SIGIO.
This commit is contained in:
Glenn Morris 2012-06-12 13:43:09 -04:00
parent 03043c1b27
commit 45fa9c0fbf
9 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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>

14
configure.in
View file

@ -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"

8
src/ChangeLog
View file

@ -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

2
src/s/bsd-common.h
View file

@ -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

2
src/s/darwin.h
View file

@ -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

1
src/s/gnu-kfreebsd.h
View file

@ -1,3 +1,2 @@
#include "gnu-linux.h"
#define NO_TERMIO /* use only <termios.h> */

6
src/s/hpux10-20.h
View file

@ -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. */

4
src/s/openbsd.h
View file

@ -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

4
src/s/usg5-4-common.h
View file

@ -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;