|
|
|
@ -6512,63 +6512,72 @@ if test "x$enable_cppunit" = "xyes"; then
|
|
|
|
|
[ --enable-online-tests Include online tests with CPPUNIT tests],, |
|
|
|
|
enable_online_tests=no) |
|
|
|
|
AC_MSG_RESULT($enable_online_tests) |
|
|
|
|
cppunit_version_min=$1 |
|
|
|
|
|
|
|
|
|
if test x$cppunit_config_exec_prefix != x ; then |
|
|
|
|
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" |
|
|
|
|
if test x${CPPUNIT_CONFIG+set} != xset ; then |
|
|
|
|
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config |
|
|
|
|
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists cppunit; then |
|
|
|
|
PKG_CHECK_MODULES(CPPUNIT, [cppunit >= $cppunit_version_min],, |
|
|
|
|
[ |
|
|
|
|
AC_MSG_WARN(Minimum version of CPPUNIT couldn't be found. Tests will not be built) |
|
|
|
|
no_cppunit=yes |
|
|
|
|
]) |
|
|
|
|
else |
|
|
|
|
if test x$cppunit_config_exec_prefix != x ; then |
|
|
|
|
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" |
|
|
|
|
if test x${CPPUNIT_CONFIG+set} != xset ; then |
|
|
|
|
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
if test x$cppunit_config_prefix != x ; then |
|
|
|
|
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" |
|
|
|
|
if test x${CPPUNIT_CONFIG+set} != xset ; then |
|
|
|
|
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config |
|
|
|
|
if test x$cppunit_config_prefix != x ; then |
|
|
|
|
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" |
|
|
|
|
if test x${CPPUNIT_CONFIG+set} != xset ; then |
|
|
|
|
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no) |
|
|
|
|
cppunit_version_min=$1 |
|
|
|
|
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no) |
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for CPPUNIT - version >= $cppunit_version_min) |
|
|
|
|
no_cppunit="" |
|
|
|
|
if test "$CPPUNIT_CONFIG" = "no" ; then |
|
|
|
|
AC_MSG_RESULT(no) |
|
|
|
|
AC_MSG_WARN(Unable to locate cppunit-config. Tests will not be built) |
|
|
|
|
no_cppunit=yes |
|
|
|
|
else |
|
|
|
|
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` |
|
|
|
|
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` |
|
|
|
|
cppunit_version=`$CPPUNIT_CONFIG --version` |
|
|
|
|
|
|
|
|
|
cppunit_major_version=`echo $cppunit_version | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
|
|
|
|
cppunit_minor_version=`echo $cppunit_version | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
|
|
|
|
cppunit_micro_version=`echo $cppunit_version | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
|
|
|
|
|
|
|
|
|
cppunit_major_min=`echo $cppunit_version_min | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
|
|
|
|
cppunit_minor_min=`echo $cppunit_version_min | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
|
|
|
|
cppunit_micro_min=`echo $cppunit_version_min | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
|
|
|
|
|
|
|
|
|
cppunit_version_proper=`expr \ |
|
|
|
|
$cppunit_major_version \> $cppunit_major_min \| \ |
|
|
|
|
$cppunit_major_version \= $cppunit_major_min \& \ |
|
|
|
|
$cppunit_minor_version \> $cppunit_minor_min \| \ |
|
|
|
|
$cppunit_major_version \= $cppunit_major_min \& \ |
|
|
|
|
$cppunit_minor_version \= $cppunit_minor_min \& \ |
|
|
|
|
$cppunit_micro_version \>= $cppunit_micro_min ` |
|
|
|
|
|
|
|
|
|
if test "$cppunit_version_proper" = "1" ; then |
|
|
|
|
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version]) |
|
|
|
|
else |
|
|
|
|
AC_MSG_RESULT(no) |
|
|
|
|
AC_MSG_WARN(Minimum version of CPPUNIT couldn't be found. Tests will not be built) |
|
|
|
|
no_cppunit=yes |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for CPPUNIT - version >= $cppunit_version_min) |
|
|
|
|
no_cppunit="" |
|
|
|
|
if test "$CPPUNIT_CONFIG" = "no" ; then |
|
|
|
|
AC_MSG_RESULT(no) |
|
|
|
|
AC_MSG_WARN(Unable to locate cppunit-config. Tests will not be built) |
|
|
|
|
no_cppunit=yes |
|
|
|
|
else |
|
|
|
|
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` |
|
|
|
|
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` |
|
|
|
|
cppunit_version=`$CPPUNIT_CONFIG --version` |
|
|
|
|
|
|
|
|
|
cppunit_major_version=`echo $cppunit_version | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
|
|
|
|
cppunit_minor_version=`echo $cppunit_version | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
|
|
|
|
cppunit_micro_version=`echo $cppunit_version | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
|
|
|
|
|
|
|
|
|
cppunit_major_min=`echo $cppunit_version_min | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
|
|
|
|
cppunit_minor_min=`echo $cppunit_version_min | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
|
|
|
|
cppunit_micro_min=`echo $cppunit_version_min | \ |
|
|
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
|
|
|
|
|
|
|
|
|
cppunit_version_proper=`expr \ |
|
|
|
|
$cppunit_major_version \> $cppunit_major_min \| \ |
|
|
|
|
$cppunit_major_version \= $cppunit_major_min \& \ |
|
|
|
|
$cppunit_minor_version \> $cppunit_minor_min \| \ |
|
|
|
|
$cppunit_major_version \= $cppunit_major_min \& \ |
|
|
|
|
$cppunit_minor_version \= $cppunit_minor_min \& \ |
|
|
|
|
$cppunit_micro_version \>= $cppunit_micro_min ` |
|
|
|
|
|
|
|
|
|
if test "$cppunit_version_proper" = "1" ; then |
|
|
|
|
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version]) |
|
|
|
|
else |
|
|
|
|
AC_MSG_RESULT(no) |
|
|
|
|
AC_MSG_WARN(Minimum version of CPPUNIT couldn't be found. Tests will not be built) |
|
|
|
|
no_cppunit=yes |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
else |
|
|
|
|
no_cppunit=user |
|
|
|
|