diff options
| author | Glenn Morris | 2012-07-12 15:48:21 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-12 15:48:21 -0400 |
| commit | 3e91a053d994909287c300dc93e1f37ce6f8e44e (patch) | |
| tree | 5bca2827d49d98c432a9dba6f3172c076ce0af99 | |
| parent | b300b1f42470b266e6eaabb05529a21d53e45ca0 (diff) | |
| download | emacs-3e91a053d994909287c300dc93e1f37ce6f8e44e.tar.gz emacs-3e91a053d994909287c300dc93e1f37ce6f8e44e.zip | |
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.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/s/gnu-linux.h | 4 |
4 files changed, 6 insertions, 5 deletions
| @@ -8,7 +8,7 @@ | |||
| 8 | (BROKEN_SIGPOLL, BROKEN_SIGPTY, FIRST_PTY_LETTER) | 8 | (BROKEN_SIGPOLL, BROKEN_SIGPTY, FIRST_PTY_LETTER) |
| 9 | (G_SLICE_ALWAYS_MALLOC, PREFER_VSUSP, PTY_ITERATION, PTY_OPEN) | 9 | (G_SLICE_ALWAYS_MALLOC, PREFER_VSUSP, PTY_ITERATION, PTY_OPEN) |
| 10 | (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP) | 10 | (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP) |
| 11 | (SETPGRP_RELEASES_CTTY, TAB3, TABDLY, RUN_TIME_REMAP) | 11 | (SETPGRP_RELEASES_CTTY, TAB3, TABDLY, RUN_TIME_REMAP, UNIX98_PTYS) |
| 12 | (XOS_NEEDS_TIME_H): Move here from src/s. | 12 | (XOS_NEEDS_TIME_H): Move here from src/s. |
| 13 | 13 | ||
| 14 | 2012-07-11 Glenn Morris <rgm@gnu.org> | 14 | 2012-07-11 Glenn Morris <rgm@gnu.org> |
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 | |||
| 3340 | gnu-linux | gnu-kfreebsd ) | 3340 | gnu-linux | gnu-kfreebsd ) |
| 3341 | dnl if HAVE_GRANTPT | 3341 | dnl if HAVE_GRANTPT |
| 3342 | if test "x$ac_cv_func_grantpt" = xyes; then | 3342 | if test "x$ac_cv_func_grantpt" = xyes; then |
| 3343 | AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) | ||
| 3343 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] ) | 3344 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] ) |
| 3344 | dnl Note that grantpt and unlockpt may fork. We must block SIGCHLD | 3345 | dnl Note that grantpt and unlockpt may fork. We must block SIGCHLD |
| 3345 | dnl to prevent sigchld_handler from intercepting the child's death. | 3346 | 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 @@ | |||
| 1 | 2012-07-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * s/gnu-linux.h (UNIX98_PTYS): Let configure set it. | ||
| 4 | |||
| 1 | 2012-07-12 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-07-12 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Fix typos that broke OS X build. | 7 | 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 <http://www.gnu.org/licenses/>. */ | |||
| 25 | #define USG | 25 | #define USG |
| 26 | #define GNU_LINUX | 26 | #define GNU_LINUX |
| 27 | 27 | ||
| 28 | #if defined HAVE_GRANTPT | ||
| 29 | #define UNIX98_PTYS | ||
| 30 | #endif /* HAVE_GRANTPT */ | ||
| 31 | |||
| 32 | /* Here, on a separate page, add any special hacks needed | 28 | /* Here, on a separate page, add any special hacks needed |
| 33 | to make Emacs work on this system. For example, | 29 | to make Emacs work on this system. For example, |
| 34 | you might define certain system call names that don't | 30 | you might define certain system call names that don't |