From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 24 Mar 2010 12:49:51 +0000 (+0100)
Subject: maint.mk (sc_Wundef_boolean): Skip test if no config.h.
X-Git-Tag: v0.1~4439
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=0fb0ec0c7969a1379edbf0c3b9c26927b8ffd560;p=gnulib.git

maint.mk (sc_Wundef_boolean): Skip test if no config.h.

Signed-off-by: Simon Josefsson <simon@josefsson.org>
---

diff --git a/ChangeLog b/ChangeLog
index 1d1389559..bbfecf941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-23  Pádraig Brady <P@draigBrady.com>  (tiny change)
+
+	* maint.mk (sc_Wundef_boolean): Check for the presence of the
+	config header before grepping, as it's not present before
+	autoreconf/configure are run.  Reported by Simon Josefsson.
+
 2010-03-23  Bruno Haible  <bruno@clisp.org>
 
 	pt_chown: Make it work with automake < 1.11.
diff --git a/top/maint.mk b/top/maint.mk
index 67421f2bb..09da20afc 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -766,8 +766,9 @@ sc_copyright_check:
 # tests many undefined macros, and so we can't enable that option.
 # So at least preclude common boolean strings as macro values.
 sc_Wundef_boolean:
-	@grep -Ei '^#define.*(yes|no|true|false)$$' '$(CONFIG_INCLUDE)' && \
-	  { echo 'Use 0 or 1 for macro values' 1>&2; exit 1; } || :
+	@test -e '$(CONFIG_INCLUDE)' &&                                 \
+	   grep -Ei '^#define.*(yes|no|true|false)$$' '$(CONFIG_INCLUDE)' && \
+	     { echo 'Use 0 or 1 for macro values' 1>&2; exit 1; } || :
 
 sc_vulnerable_makefile_CVE-2009-4029:
 	@files=$$(find $(srcdir) -name Makefile.in);			\