diff options
| author | Kalev Lember <kalevlember@gmail.com> | 2014-10-30 11:31:36 +0100 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2014-11-09 22:45:20 +0000 |
| commit | 40d11faf6fa5afc2bea31a288d45b11b45f38d75 (patch) | |
| tree | c62dc8eb57154008a5e49ceeeeaec35e9aa6d9d1 | |
| parent | f8c2549e1441f55b5e1b62e88ca99151854f27de (diff) | |
| download | libgdata-40d11faf6fa5afc2bea31a288d45b11b45f38d75.tar.gz | |
Add --disable-tests to skip the building of tests
https://bugzilla.gnome.org/show_bug.cgi?id=739395
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 9940f4a4..24c1d821 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = . gdata/tests po docs +SUBDIRS = . po docs + +if ENABLE_TESTS +SUBDIRS += gdata/tests +endif ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/configure.ac b/configure.ac index 442d1040..5a102b4e 100644 --- a/configure.ac +++ b/configure.ac @@ -149,10 +149,14 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE]) AC_SUBST([GNOME_PACKAGES]) AC_SUBST([GOA_ENABLED]) -dnl **************************** -dnl Check for uhttpmock -dnl **************************** -PKG_CHECK_MODULES(UHTTPMOCK, libuhttpmock-0.0) +AC_MSG_CHECKING([whether to build tests]) +AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests], [Enable building of tests]),, [enable_tests=yes]) +AC_MSG_RESULT($enable_tests) +AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"]) + +if test "x$enable_tests" = "xyes"; then + PKG_CHECK_MODULES(UHTTPMOCK, libuhttpmock-0.0) +fi # Various necessary functions and headers AC_CHECK_FUNCS([memset]) |