X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ftermios;h=facebebde972b56e5b51cca23a81efe4004e2913;hb=e916d00297510297b63af2ea9790c4f6c0ac0105;hp=3c7804c7aa2080cea8e328a42c30106dd1e51919;hpb=6fe217a2c227471a18c4d49105721675d3e2a1d3;p=gnulib.git

diff --git a/modules/termios b/modules/termios
index 3c7804c7a..facebebde 100644
--- a/modules/termios
+++ b/modules/termios
@@ -7,8 +7,8 @@ m4/termios_h.m4
 
 Depends-on:
 include_next
-c++defs
-warn-on-use
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_TERMIOS_H
@@ -18,14 +18,17 @@ BUILT_SOURCES += termios.h
 
 # We need the following in order to create <termios.h> when the system
 # version does not have all declarations.
-termios.h: termios.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
-	      -e 's|@''GNULIB_TCGETSID''@|$(GNULIB_TCGETSID)|g' \
-	      -e 's|@''HAVE_TCGETSID''@|$(HAVE_TCGETSID)|g' \
+	      -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \
+	      -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \
+	      -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	    < $(srcdir)/termios.in.h; \