From: Brian Aker <brian@tangent.org>
Date: Sun, 13 Jan 2013 11:46:07 +0000 (-0500)
Subject: Merge in build trunk.
X-Git-Tag: 1.0.16~10^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=baa7ee012f8399dc3e19860224179f4111e7efbf;hp=df7f3833beaf5501eec4224bf88fe480b8b03424;p=awesomized%2Flibmemcached

Merge in build trunk.
---

diff --git a/Makefile.am b/Makefile.am
index 33d8fcaa..6aa50af8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 SUFFIXES =
 .PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -81,7 +82,9 @@ include win32/include.am
 include m4/include.am
 endif
 
+TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
 
 merge-clean:
 	@find ./ | $(GREP) \.gcda | xargs rm -f