X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fpty_h.m4;h=7c1a3c19e79699e4a5d9ab2cced8025bdf29d402;hb=2c19fe9c2316d113610aa895d5203a9252cb692d;hp=32dec731557558c57a28291c060721e702c5208b;hpb=0c36c3169eddff793fa25a99519e4405f81d6df3;p=gnulib.git

diff --git a/m4/pty_h.m4 b/m4/pty_h.m4
index 32dec7315..7c1a3c19e 100644
--- a/m4/pty_h.m4
+++ b/m4/pty_h.m4
@@ -1,13 +1,13 @@
-# pty_h.m4 serial 6
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# pty_h.m4 serial 10
+dnl Copyright (C) 2009-2012 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])
 
@@ -32,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
@@ -48,9 +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([$1])
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
 ])
 
 AC_DEFUN([gl_PTY_H_DEFAULTS],
@@ -60,6 +62,7 @@ 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])