NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / modules / pty

diff --git a/modules/pty b/modules/pty
index 66cecef..d523d14 100644 (file)
--- a/modules/pty
+++ b/modules/pty
@@ -2,22 +2,44 @@ Description:
 A <pty.h> for systems that lacks it.
 
 Files:
-m4/pty.m4
+lib/pty.in.h
+m4/pty_h.m4
+
+Depends-on:
+include_next
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
-gl_PTY
+gl_PTY_H
 
 Makefile.am:
-BUILT_SOURCES += $(PTY_H)
+BUILT_SOURCES += pty.h
 
 # We need the following in order to create <pty.h> when the system
 # doesn't have one that works with the given compiler.
-pty.h:
+pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         echo '#include <'$(PTY_HEADER)'>'; \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_PTY_H''@|$(NEXT_PTY_H)|g' \
+             -e 's/@''GNULIB_FORKPTY''@/$(GNULIB_FORKPTY)/g' \
+             -e 's/@''GNULIB_OPENPTY''@/$(GNULIB_OPENPTY)/g' \
+             -e 's|@''HAVE_UTIL_H''@|$(HAVE_UTIL_H)|g' \
+             -e 's|@''HAVE_LIBUTIL_H''@|$(HAVE_LIBUTIL_H)|g' \
+             -e 's|@''HAVE_FORKPTY''@|$(HAVE_FORKPTY)|g' \
+             -e 's|@''HAVE_OPENPTY''@|$(HAVE_OPENPTY)|g' \
+             -e 's|@''REPLACE_FORKPTY''@|$(REPLACE_FORKPTY)|g' \
+             -e 's|@''REPLACE_OPENPTY''@|$(REPLACE_OPENPTY)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             < $(srcdir)/pty.in.h; \
        } > $@-t && \
-       mv -f $@-t $@
+       mv $@-t $@
 MOSTLYCLEANFILES += pty.h pty.h-t
 
 Include:
@@ -27,7 +49,7 @@ Link:
 $(PTY_LIB)
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson