From 1b3c9c2dcf3cfee9798d1af79c60927b7e67089c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 8 Feb 2013 08:03:23 -0800 Subject: [PATCH] openpty: fix bug where HAVE_OPENPTY is mistakenly 1 Problem reported by Mats Erik Andersson in . * m4/pty.m4 (gl_FUNC_OPENPTY): Define HAVE_OPENPTY when the openpty function exists, not merely when we intend to replace it. This corrects the 2013-01-31 patch, which mistakenly defined HAVE_OPENPTY even on hosts that lacked it. --- ChangeLog | 10 ++++++++++ m4/pty.m4 | 18 ++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index aee376524..9f1b60f4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2013-02-08 Paul Eggert + + openpty: fix bug where HAVE_OPENPTY is mistakenly 1 + Problem reported by Mats Erik Andersson in + . + * m4/pty.m4 (gl_FUNC_OPENPTY): Define HAVE_OPENPTY when the + openpty function exists, not merely when we intend to replace it. + This corrects the 2013-01-31 patch, which mistakenly defined + HAVE_OPENPTY even on hosts that lacked it. + 2013-02-07 Paul Eggert secure_getenv: fix include typo diff --git a/m4/pty.m4 b/m4/pty.m4 index 12e681b49..f8898311d 100644 --- a/m4/pty.m4 +++ b/m4/pty.m4 @@ -98,6 +98,8 @@ AC_DEFUN([gl_FUNC_OPENPTY], #endif ]]) if test $ac_cv_have_decl_openpty = yes; then + AC_DEFINE([HAVE_OPENPTY], [1], + [Define to 1 if the system has the 'openpty' function.]) dnl The system has openpty. dnl Prefer glibc's const-safe prototype, if available. AC_CACHE_CHECK([for const-safe openpty signature], @@ -122,18 +124,14 @@ AC_DEFUN([gl_FUNC_OPENPTY], ], [gl_cv_func_openpty_const=yes], [gl_cv_func_openpty_const=no]) ]) - fi - if test $gl_cv_func_openpty_const = yes; then - HAVE_OPENPTY=1 + if test $gl_cv_func_openpty_const != yes; then + REPLACE_OPENPTY=1 + fi else - dnl We need gnulib's openpty. + dnl The system does not have openpty. + HAVE_OPENPTY=0 dnl Prerequisites of lib/openpty.c in this case. - AC_CHECK_FUNCS([_getpty posix_openpt], [HAVE_OPENPTY=1], [HAVE_OPENPTY=0]) - REPLACE_OPENPTY=$HAVE_OPENPTY - fi - if test $HAVE_OPENPTY = 1; then - AC_DEFINE([HAVE_OPENPTY], [1], - [Define to 1 if the system has the 'openpty' function.]) + AC_CHECK_FUNCS([_getpty posix_openpt]) fi ]) -- 2.11.0