From 494db61c1946f0b06cc2d68a1194e8812871540e Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 26 Jul 2011 13:49:20 +0200
Subject: [PATCH] gtester: small Windows fix

This code was unconditionally present in the gtester Makefile:

test-nonrecursive: ${TEST_PROGS}

On Windows, our testcases are compiled with a .exe suffix.  That means
that if we had 'foo' in TEST_PROGS, running "make check" would depend on
'foo' (not foo.exe) being compiled.

We could bring the EXEEXT in here to fix that up, but gtester doesn't
work on Windows at all, so better to just disable it in that case.
---
 Makefile.decl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.decl b/Makefile.decl
index 163fd8bbf..f4ba2a2d5 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -17,12 +17,12 @@ if OS_UNIX
 	    test "$$subdir" = "." -o "$$subdir" = "po" || \
 	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
 	  done
-endif
 
 # test-nonrecursive: run tests only in cwd
 test-nonrecursive: ${TEST_PROGS}
-if OS_UNIX
 	@test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
+else
+test-nonrecursive:
 endif
 
 # test-report: run tests in subdirs and generate report