Fix more C++ link errors on Solaris 8.

[pspp] / modules / sys_wait

diff --git a/modules/sys_wait b/modules/sys_wait
index 2c82029711e9120344280b17cae412bfded47388..0299f9e2dea357fe7d3f69a645332055254c9608 100644 (file)
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -9,7 +9,6 @@ Depends-on:
 c++defs
 include_next
 warn-on-use
-waitpid
 
 configure.ac:
 gl_SYS_WAIT_H
@@ -26,7 +25,9 @@ sys/wait.h: sys_wait.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
+             -e 's|@''GNULIB_WAITPID''@|$(GNULIB_WAITPID)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
              < $(srcdir)/sys_wait.in.h; \