X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstddef;h=94b57da9b0ba3bafaa1442a6ff2903c78261d12d;hb=5a9e46ab46042f007426c1e06b836cf5608d8d4a;hp=ac28e953ca5122ad92f6eb9e5be5f7fd8d9a7454;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=gnulib.git

diff --git a/modules/stddef b/modules/stddef
index ac28e953c..94b57da9b 100644
--- a/modules/stddef
+++ b/modules/stddef
@@ -17,21 +17,27 @@ BUILT_SOURCES += $(STDDEF_H)
 
 # We need the following in order to create <stddef.h> when the system
 # doesn't have one that works with the given compiler.
-stddef.h: stddef.in.h
+if GL_GENERATE_STDDEF_H
+stddef.h: stddef.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' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
 	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
 	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
 	      < $(srcdir)/stddef.in.h; \
 	} > $@-t && \
 	mv $@-t $@
+else
+stddef.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += stddef.h stddef.h-t
 
 Include:
-#include <stddef.h>
+<stddef.h>
 
 License:
 LGPLv2+