Check is not running, fix check

Also update .travis.yml

.travis.yml

@@ -29,7 +29,7 @@ script:
   - ./configure --enable-check $CONFIGURE_OPTION
   - make V=1
   - sudo make install
-  - if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check V=1; fi
+  - if [ "x$VALGRIND" == xyes ]; then make check ; else make check V=1; fi
   # XXX: tracing memory leak, disabled for some mystery reason for automake...
   # - if [ "x$VALGRIND" == xyes && "x$DEBUG" == xyes ]; then valgrind ./tests/check_* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi
 

Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS=3rdparty src . examples
 
-if HAVE_CHECK
+if ENABLE_CHECK
 SUBDIRS += tests
 endif
 

configure.ac

@@ -118,15 +118,16 @@ AC_ARG_ENABLE(check,
               AS_HELP_STRING([--enable-check],
                              [enable unit testing]),
               , enable_check=unset)
+
 if test "x$enable_check" != "xunset" ; then
 PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
   ifdef([AM_PATH_CHECK],
-  [AM_PATH_CHECK(,[have_check="yes"])],
-  AC_MSG_WARN([Check not found; cannot run unit tests!])
-  [have_check="no"])]
+    [AM_PATH_CHECK(,[have_check="yes"])],
+    AC_MSG_WARN([Check not found; cannot run unit tests!]) [have_check="no"]
+  )]
 ])
 fi
-AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+AM_CONDITIONAL(ENABLE_CHECK, test "x$enable_check" = "xyes")
 
 AC_CONFIG_FILES([
   r3.pc