fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 12:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give better diagnostics if --enable-tests=yes is given

Browse source 
We want to indicate why it's a problem that GLib, dbus-glib are missing.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
This commit is contained in:
Simon McVittie 2011-08-24 11:00:35 +01:00
parent 5defa43b6f
commit d55b3efbde
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configure.ac
View file

@ -163,7 +163,14 @@ AC_ARG_ENABLE([modular-tests],
AC_ARG_ENABLE([tests], AC_ARG_ENABLE([tests],
AS_HELP_STRING([--enable-tests], AS_HELP_STRING([--enable-tests],
[enable/disable all tests, overriding embedded-tests/modular-tests]), [enable/disable all tests, overriding embedded-tests/modular-tests]),
[enable_embedded_tests=$enableval; enable_modular_tests=$enableval], [
if test "x$enableval" = xyes; then
AC_MSG_NOTICE([Full test coverage was requested with --enable-tests=yes])
AC_MSG_NOTICE([This has many dependencies (GLib, dbus-glib, Python)])
fi
enable_embedded_tests=$enableval
enable_modular_tests=$enableval
],
[]) [])
# DBUS_ENABLE_EMBEDDED_TESTS controls unit tests built in to .c files # DBUS_ENABLE_EMBEDDED_TESTS controls unit tests built in to .c files
@ -187,7 +194,8 @@ if test "x$enable_modular_tests" != xno; then
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22, gio-2.0 >= 2.22], PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22, gio-2.0 >= 2.22],
[], [],
[if test "x$enable_modular_tests" = xyes; then [if test "x$enable_modular_tests" = xyes; then
AC_MSG_ERROR([GLib is required by the modular tests]) AC_MSG_NOTICE([Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires GLib])
AC_MSG_ERROR([$GLIB_ERRORS])
else # assumed to be "auto" else # assumed to be "auto"
enable_modular_tests=no enable_modular_tests=no
fi]) fi])
@ -195,7 +203,8 @@ if test "x$enable_modular_tests" != xno; then
PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1], PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1],
[], [],
[if test "x$enable_modular_tests" = xyes; then [if test "x$enable_modular_tests" = xyes; then
AC_MSG_ERROR([dbus-glib is required by the modular tests (for now)]) AC_MSG_NOTICE([Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires dbus-glib])
AC_MSG_ERROR([$DBUS_GLIB_ERRORS])
else # assumed to be "auto" else # assumed to be "auto"
enable_modular_tests=no enable_modular_tests=no
fi]) fi])