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