3 files changed, 13 insertions, 0 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 80f3e62e..9cab14af 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,3 +36,11 @@ libnagiosplug_a_SOURCES = snprintf.c
 
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/intl
 
+BUILT_SOURCES = $(STDBOOL_H)
+EXTRA_DIST = stdbool_.h
+MOSTLYCLEANFILES = stdbool.h stdbool.ht
+# Create stdbool.h on systems that lack a working one.
+stdbool.h: stdbool_.h
+        sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > $@t
+        mv $@t $@
+
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 4fe72f1f..ddb9d08a 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_DIST += np_coreutils.m4
 EXTRA_DIST += onceonly.m4
 EXTRA_DIST += progtest.m4
 EXTRA_DIST += realloc.m4
+EXTRA_DIST += stdbool.m4
 EXTRA_DIST += stdint_h.m4
 EXTRA_DIST += uintmax_t.m4
 EXTRA_DIST += ulonglong.m4
diff --git a/m4/np_coreutils.m4 b/m4/np_coreutils.m4
index 3f87686f..e7296040 100644
--- a/m4/np_coreutils.m4
+++ b/m4/np_coreutils.m4
@@ -6,8 +6,12 @@ m4_pattern_forbid([^np_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 
+dnl These are all m4 things that need to be called
+dnl Usually in coreutils' prereq.m4, but this is a subset that we need
 AC_DEFUN([np_COREUTILS],
 [
+  AC_REQUIRE([gl_GETOPT])
+  AC_REQUIRE([AM_STDBOOL_H])
   AC_REQUIRE([jm_AFS])
   AC_REQUIRE([gl_EXITFAIL])
   AC_REQUIRE([gl_XALLOC])