diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-24 10:59:41 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-21 11:25:48 +0100 |
| commit | 5defa43b6f809f39ec79cc426414f2f6b1896065 (patch) | |
| tree | 7f251bade1db7daa6e3cb55b48e2afddadd212dd /configure.ac | |
| parent | 7fc9c026669976463adcd1e02ad19c582ed27289 (diff) | |
| download | dbus-5defa43b6f809f39ec79cc426414f2f6b1896065.tar.gz | |
Check for Python; skip Python tests if not found
As with the optional test-dependencies on GLib and dbus-glib, we make this
a hard dependency if --enable-tests[=yes], but not if --enable-tests=auto.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 864303fa..efe14f4d 100644 --- a/configure.ac +++ b/configure.ac @@ -218,6 +218,15 @@ AC_ARG_ENABLE([installed-tests], AM_CONDITIONAL([DBUS_ENABLE_INSTALLED_TESTS], [test "x$enable_installed_tests" = xyes]) +if test "x$enable_tests" = xyes; then + # full test coverage is required, Python is a hard dependency + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python]) + AM_PATH_PYTHON([2.6]) +else + # --enable-tests not given: do not abort if Python is missing + AM_PATH_PYTHON([2.6], [], [:]) +fi + if test x$enable_verbose_mode = xyes; then AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) fi |