As an addendum to this patch, let's make the naming of macros more consistent:
2010-03-21 Bruno Haible <br...@clisp.org>
pty: Consistent macro naming.
* m4/pty_h.m4 (gl_PTY_H): Renamed from gl_PTY.
* m4/pty.m4 (gl_FORKPTY, gl_OPENPTY): Update.
* modules/pty (configure.ac): Update.
--- m4/pty_h.m4.orig Mon Mar 22 00:52:17 2010
+++ m4/pty_h.m4 Mon Mar 22 00:51:08 2010
@@ -1,13 +1,13 @@
-# pty_h.m4 serial 6
+# pty_h.m4 serial 7
dnl Copyright (C) 2009, 2010 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])
--- m4/pty.m4.orig Mon Mar 22 00:52:17 2010
+++ m4/pty.m4 Mon Mar 22 00:51:32 2010
@@ -1,4 +1,4 @@
-# pty.m4 serial 2
+# pty.m4 serial 3
dnl Copyright (C) 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -23,7 +23,7 @@
AC_DEFUN([gl_FORKPTY],
[
AC_REQUIRE([gl_PTY_LIB])
- AC_REQUIRE([gl_PTY])
+ AC_REQUIRE([gl_PTY_H])
AC_CHECK_DECLS([forkpty],,, [[
#if HAVE_PTY_H
@@ -68,7 +68,7 @@
AC_DEFUN([gl_OPENPTY],
[
AC_REQUIRE([gl_PTY_LIB])
- AC_REQUIRE([gl_PTY])
+ AC_REQUIRE([gl_PTY_H])
dnl Persuade Solaris <stdlib.h> to declare posix_openpt().
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
--- modules/pty.orig Mon Mar 22 00:52:17 2010
+++ modules/pty Mon Mar 22 00:51:51 2010
@@ -11,7 +11,7 @@
warn-on-use
configure.ac:
-gl_PTY
+gl_PTY_H
Makefile.am:
BUILT_SOURCES += pty.h
