collabvm/r3
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Check is not running, fix check

Browse source
This commit is contained in:
c9s 2016-03-12 12:39:58 +08:00
parent 0c5f1f6b5c
commit 43fd09e8a6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

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

9
configure.ac
View file

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