c3adf93714
Fix build with current gtk-doc, see Staging:O - Drop dependency on deprecated gnome-common, just run autoreconf - Do not include unused tree_index.sgml, fix build with gtk-doc >= 1.32, see https://gitlab.gnome.org/GNOME/gtk-doc/issues/103 * add 0001-Fix-build-with-gtk-doc-1.32-due-to-non-existing-tree.patch - Fix missing accelerators, add 0002-genericmenuitem-Make-accelerator-text-appear-again.patch - Split Gtk2 and Gtk3 build - glib, tools and doc subpackage are created from the Gtk2 flavor. * Fix building with disabled tests, add 0003-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch OBS-URL: https://build.opensuse.org/request/show/749395 OBS-URL: https://build.opensuse.org/package/show/X11:Unity/libdbusmenu?expand=0&rev=12
29 lines
972 B
Diff
29 lines
972 B
Diff
From e63121874a8bc1cba73707e9a5ba5992efdd9eaa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Mon, 18 Nov 2019 19:58:53 +0100
|
|
Subject: [PATCH 3/3] Fix HAVE_VALGRIND AM_CONDITIONAL
|
|
|
|
The AM_CONDITIONAL should also be run with --disable-tests, otherwise
|
|
HAVE_VALGRIND is undefined.
|
|
---
|
|
configure.ac | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ace54d1..cbd38a6 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
|
|
[have_tests=yes]
|
|
)
|
|
PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no)
|
|
-AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
|
|
])
|
|
+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
|
|
|
|
AC_SUBST(DBUSMENUTESTS_CFLAGS)
|
|
AC_SUBST(DBUSMENUTESTS_LIBS)
|
|
--
|
|
2.24.0
|
|
|