Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / pty.m4

diff --git a/m4/pty.m4 b/m4/pty.m4
index 12e681b..c68cca7 100644 (file)
--- a/m4/pty.m4
+++ b/m4/pty.m4
@@ -1,5 +1,5 @@
-# pty.m4 serial 12
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# pty.m4 serial 13
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -72,6 +72,8 @@ AC_DEFUN([gl_FUNC_FORKPTY],
     dnl The system does not have forkpty.
     HAVE_FORKPTY=0
   fi
+  AC_DEFINE_UNQUOTED([HAVE_FORKPTY], [$HAVE_FORKPTY],
+    [Define to 1 if the system has the 'forkpty' function.])
 ])
 
 AC_DEFUN([gl_FUNC_OPENPTY],
@@ -98,6 +100,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 +126,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
 ])