From: Glenn Morris Date: Thu, 12 Jul 2012 19:48:21 +0000 (-0400) Subject: Move UNIX98_PTYS from src/s to configure X-Git-Tag: emacs-24.2.90~1199^2~33 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e91a053d994909287c300dc93e1f37ce6f8e44e;p=emacs.git Move UNIX98_PTYS from src/s to configure * configure.ac (UNIX98_PTYS): Move here from src/s. * src/s/gnu-linux.h (UNIX98_PTYS): Let configure set it. --- diff --git a/ChangeLog b/ChangeLog index d111e9f6319..a7aad6a0734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ (BROKEN_SIGPOLL, BROKEN_SIGPTY, FIRST_PTY_LETTER) (G_SLICE_ALWAYS_MALLOC, PREFER_VSUSP, PTY_ITERATION, PTY_OPEN) (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP) - (SETPGRP_RELEASES_CTTY, TAB3, TABDLY, RUN_TIME_REMAP) + (SETPGRP_RELEASES_CTTY, TAB3, TABDLY, RUN_TIME_REMAP, UNIX98_PTYS) (XOS_NEEDS_TIME_H): Move here from src/s. 2012-07-11 Glenn Morris diff --git a/configure.ac b/configure.ac index 191d2ae7e05..6ac53bbd64d 100644 --- a/configure.ac +++ b/configure.ac @@ -3340,6 +3340,7 @@ case $opsys in gnu-linux | gnu-kfreebsd ) dnl if HAVE_GRANTPT if test "x$ac_cv_func_grantpt" = xyes; then + AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] ) dnl Note that grantpt and unlockpt may fork. We must block SIGCHLD dnl to prevent sigchld_handler from intercepting the child's death. diff --git a/src/ChangeLog b/src/ChangeLog index 2d661f2be09..14428f427d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-12 Glenn Morris + + * s/gnu-linux.h (UNIX98_PTYS): Let configure set it. + 2012-07-12 Paul Eggert Fix typos that broke OS X build. diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 626113b119c..90725815dea 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -25,10 +25,6 @@ along with GNU Emacs. If not, see . */ #define USG #define GNU_LINUX -#if defined HAVE_GRANTPT -#define UNIX98_PTYS -#endif /* HAVE_GRANTPT */ - /* Here, on a separate page, add any special hacks needed to make Emacs work on this system. For example, you might define certain system call names that don't