From 9fdffffad88a06f406d74ea9b23643a05a4069ef Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Thu, 31 Jan 2013 13:55:55 -0800 Subject: [PATCH] openpty: fix bug where HAVE_OPENPTY wasn't defined See the thread starting at: http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00185.html * m4/pty.m4 (gl_FUNC_OPENPTY): Define HAVE_OPENPTY when the openpty function exists, not merely when we intend to replace it. --- ChangeLog | 8 ++++++++ m4/pty.m4 | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36408d790..c18cbad98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-01-31 Reuben Thomas + + openpty: fix bug where HAVE_OPENPTY wasn't defined + See the thread starting at: + http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00185.html + * m4/pty.m4 (gl_FUNC_OPENPTY): Define HAVE_OPENPTY when the + openpty function exists, not merely when we intend to replace it. + 2013-01-30 Paul Eggert sys_time: port to Solaris 2.6 diff --git a/m4/pty.m4 b/m4/pty.m4 index c6b357916..12e681b49 100644 --- a/m4/pty.m4 +++ b/m4/pty.m4 @@ -122,16 +122,18 @@ AC_DEFUN([gl_FUNC_OPENPTY], ], [gl_cv_func_openpty_const=yes], [gl_cv_func_openpty_const=no]) ]) - if test $gl_cv_func_openpty_const != yes; then - REPLACE_OPENPTY=1 - AC_DEFINE([HAVE_OPENPTY], [1], - [Define to 1 if the system has the 'openpty' function.]) - fi + fi + if test $gl_cv_func_openpty_const = yes; then + HAVE_OPENPTY=1 else - dnl The system does not have openpty. - HAVE_OPENPTY=0 + dnl We need gnulib's openpty. dnl Prerequisites of lib/openpty.c in this case. - AC_CHECK_FUNCS([_getpty posix_openpt]) + 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.]) fi ]) -- 2.11.0