X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fpty_h.m4;h=32b1c75b060436a66af09043170db0e757b1456f;hb=da8054d48dc22e1c051db54049e005d51a006e69;hp=05ac3575c4ec97a7704417f48cc3e781123c8d47;hpb=9d84afa467b0a9abcd6e0d90fc7d1608f07bf2f1;p=gnulib.git

diff --git a/m4/pty_h.m4 b/m4/pty_h.m4
index 05ac3575c..32b1c75b0 100644
--- a/m4/pty_h.m4
+++ b/m4/pty_h.m4
@@ -1,13 +1,13 @@
-# pty_h.m4 serial 3
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# pty_h.m4 serial 10
+dnl Copyright (C) 2009-2013 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.
 
-# gl_PTY
-# ------
-# Make sure that pty.h provides forkpty, or sets up a replacement header.
-AC_DEFUN_ONCE([gl_PTY],
+# gl_PTY_H
+# --------
+# Set up the GNU-like <pty.h> replacement header.
+AC_DEFUN_ONCE([gl_PTY_H],
 [
   AC_REQUIRE([gl_PTY_H_DEFAULTS])
 
@@ -22,18 +22,6 @@ AC_DEFUN_ONCE([gl_PTY],
     if test $ac_cv_header_libutil_h = yes; then
       HAVE_LIBUTIL_H=1
     fi
-    dnl FIXME - move this into forkpty module, when replacement is provided
-    AC_CHECK_DECLS([forkpty],,, [[
-#if HAVE_UTIL_H
-# include <util.h>
-#endif
-#if HAVE_LIBUTIL_H
-# include <libutil.h>
-#endif
-]])
-    if test $ac_cv_have_decl_forkpty = no; then
-      AC_MSG_WARN([[Cannot find forkpty, build will likely fail]])
-    fi
   else # Have <pty.h>, assume forkpty is declared there.
     HAVE_PTY_H=1
   fi
@@ -44,6 +32,8 @@ AC_DEFUN_ONCE([gl_PTY],
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+#include <sys/types.h>
 #if HAVE_PTY_H
 # include <pty.h>
 #endif
@@ -60,7 +50,9 @@ AC_DEFUN([gl_PTY_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_PTY_H_DEFAULTS])
-  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
 ])
 
 AC_DEFUN([gl_PTY_H_DEFAULTS],
@@ -70,4 +62,8 @@ AC_DEFUN([gl_PTY_H_DEFAULTS],
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_UTIL_H=0;        AC_SUBST([HAVE_UTIL_H])
   HAVE_LIBUTIL_H=0;     AC_SUBST([HAVE_LIBUTIL_H])
+  HAVE_FORKPTY=1;       AC_SUBST([HAVE_FORKPTY])
+  HAVE_OPENPTY=1;       AC_SUBST([HAVE_OPENPTY])
+  REPLACE_FORKPTY=0;    AC_SUBST([REPLACE_FORKPTY])
+  REPLACE_OPENPTY=0;    AC_SUBST([REPLACE_OPENPTY])
 ])