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