Ignore git's merge conflict files when finding unit tests

diff --git a/configure.ac b/configure.ac
index 35f1d9a0eb1251ff94b329288c68870251d62716..aef2b6d5d32e54f33ef1d85f680b47565ac1876d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -131,10 +131,7 @@ elif test ! -f $srcdir/version.c; then
 fi
 
 dnl Find test suite files.
-test_suites=""
-for x in $srcdir/test/test_*.c; do
-    test_suites="$test_suites $x"
-done
+test_suites=`ls test/test_*.c | grep -Ev 'BASE|BACKUP|LOCAL|REMOTE' | xargs echo`
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT