X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ferrno;h=2640ec8bbdb0471bc2ac6ac51d9cf196a8a8c9ef;hb=63ce57e7e9fff1265da4e0a4d2639483c28b6b93;hp=208636dc3809785ce5a33f0c71b3430335c32b1c;hpb=9f2c2152d14031f8d4757647ca7c9d8d0f64b095;p=gnulib.git

diff --git a/modules/errno b/modules/errno
index 208636dc3..2640ec8bb 100644
--- a/modules/errno
+++ b/modules/errno
@@ -3,24 +3,32 @@ A POSIX-like <errno.h>.
 
 Files:
 lib/errno.in.h
+lib/strerror-override.h
+lib/strerror-override.c
 m4/errno_h.m4
 
 Depends-on:
 include_next
 
 configure.ac:
-AC_REQUIRE([gl_HEADER_ERRNO_H])
+gl_HEADER_ERRNO_H
+if test -n "$ERRNO_H"; then
+  AC_LIBOBJ([strerror-override])
+fi
 
 Makefile.am:
 BUILT_SOURCES += $(ERRNO_H)
 
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
-errno.h: errno.in.h
-	rm -f $@-t $@
+if GL_GENERATE_ERRNO_H
+errno.h: errno.in.h $(top_builddir)/config.status
+	$(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_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
 	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
 	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
@@ -29,8 +37,12 @@ errno.h: errno.in.h
 	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
 	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
 	      < $(srcdir)/errno.in.h; \
-	} > $@-t
+	} > $@-t && \
 	mv $@-t $@
+else
+errno.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += errno.h errno.h-t
 
 Include: