gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / stdbool

diff --git a/modules/stdbool b/modules/stdbool
index 90eb939..cfb9aac 100644 (file)
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -3,7 +3,7 @@ An <stdbool.h> that nearly conforms to C99.
 (Nearly: casts to bool may not work.)
 
 Files:
-lib/stdbool_.h
+lib/stdbool.in.h
 m4/stdbool.m4
 
 Depends-on:
@@ -16,16 +16,21 @@ BUILT_SOURCES += $(STDBOOL_H)
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-stdbool.h: stdbool_.h
-       rm -f $@-t $@
+if GL_GENERATE_STDBOOL_H
+stdbool.h: stdbool.in.h $(top_builddir)/config.status
+       $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h; \
-       } > $@-t
+         sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+       } > $@-t && \
        mv $@-t $@
+else
+stdbool.h: $(top_builddir)/config.status
+       rm -f $@
+endif
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
 Include:
-#include <stdbool.h>
+<stdbool.h>
 
 License:
 LGPLv2+