pty: Consistent macro naming.

diff --git a/ChangeLog b/ChangeLog
index fc94be5b57b22a88c4ac4ecde704689b1886fec6..b0b19568bb9985a7b387e5f99293fa469010f419 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-21  Bruno Haible  <bruno@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.
+
 2010-03-21  Bruno Haible  <bruno@clisp.org>
 
        Tests for openpty: Make stricter.

diff --git a/m4/pty.m4 b/m4/pty.m4
index 5aec23b4cd4e814d22d3daaa18d822444116bd4f..6d2393b0a209975134403b9b535433d5df19dd5f 100644 (file)
--- a/m4/pty.m4
+++ b/m4/pty.m4
@@ -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_PTY_LIB],
 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_FORKPTY],
 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])

diff --git a/m4/pty_h.m4 b/m4/pty_h.m4
index 32dec731557558c57a28291c060721e702c5208b..33cb43c4fadb045d0971264c7a83c455c8d6725a 100644 (file)
--- a/m4/pty_h.m4
+++ b/m4/pty_h.m4
@@ -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])
 

diff --git a/modules/pty b/modules/pty
index ead3a7e129fb2443c9a2f5cfe8f01f4a8e8f6a52..aed2406473e69949a0c121ad2ece26ab06a17f23 100644 (file)
--- a/modules/pty
+++ b/modules/pty
@@ -11,7 +11,7 @@ include_next
 warn-on-use
 
 configure.ac:
-gl_PTY
+gl_PTY_H
 
 Makefile.am:
 BUILT_SOURCES += pty.h