Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Tue, 27 Jun 2017 21:00:58 +0100 |
| 4 | Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency |
| 5 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 6 | Allow the tests to be explicitly disabled to avoid floating dependnecy |
| 7 | issues. This is not really an issue with RSS but is on previous releases. |
| 8 | |
| 9 | RP 2017/6/27 |
| 10 | Upstream-Status: Pending |
| 11 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 12 | --- |
| 13 | configure.ac | 10 ++++++++++ |
| 14 | 1 file changed, 10 insertions(+) |
| 15 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index 684e2d1..e5e3aab 100644 |
| 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
| 20 | @@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 21 | fi |
| 22 | fi |
| 23 | |
| 24 | +AC_ARG_ENABLE([tests], |
| 25 | + AS_HELP_STRING([--enable-tests], |
| 26 | + [enable tests (default=yes)]),, |
| 27 | + [enable_tests="yes"]) |
| 28 | + |
| 29 | dnl if glib is available we can enable the tests |
| 30 | PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
| 31 | [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | @@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 33 | build_tests="no" |
| 34 | ] |
| 35 | ) |
| 36 | +if test "x$enable_tests" != "xyes"; then |
| 37 | + gtk_doc_use_libtool="no" |
| 38 | + build_tests="no" |
| 39 | +fi |
| 40 | + |
| 41 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 42 | dnl this enables the rule in test/Makefile.am |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 43 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 44 | -- |
| 45 | 2.14.1 |
| 46 | |