1
=== modified file 'configure.ac'
2
--- configure.ac	2012-03-29 18:08:49 +0000
3
+++ configure.ac	2012-04-02 14:28:25 +0000
4
@@ -118,10 +118,10 @@
5
118
118
6
119
AS_IF([test "x$enable_tests" != "xno"],[
119
AS_IF([test "x$enable_tests" != "xno"],[
7
120
PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
120
PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
10
121
                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION
121
                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION,
9
122
                                  valgrind,
11
123
                                  [have_tests=yes]
122
                                  [have_tests=yes]
12
124
)
123
)
13
124
PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind)
14
125
])
125
])
15
126
126
16
127
AC_SUBST(DBUSMENUTESTS_CFLAGS)
127
AC_SUBST(DBUSMENUTESTS_CFLAGS)
17
128
128
18
=== modified file 'tests/Makefile.am'
19
--- tests/Makefile.am	2012-03-29 04:30:40 +0000
20
+++ tests/Makefile.am	2012-04-02 14:28:25 +0000
21
@@ -223,6 +223,7 @@
22
223
	-I $(srcdir) \
223
	-I $(srcdir) \
23
224
	$(DBUSMENUGLIB_CFLAGS) \
224
	$(DBUSMENUGLIB_CFLAGS) \
24
225
	$(DBUSMENUTESTS_CFLAGS) \
225
	$(DBUSMENUTESTS_CFLAGS) \
25
226
	$(DBUSMENUTESTSVALGRIND_CFLAGS) \
26
226
	-Wall -Werror
227
	-Wall -Werror
27
227
228
28
228
test_json_server_LDADD = \
229
test_json_server_LDADD = \
Status:	Merged
Approved by:	Charles Kerr on 2012-04-02
Approved revision:	398
Merge reported by:	Charles Kerr
Merged at revision:	not available
Proposed branch:	lp:~ted/libdbusmenu/valgrind-no-libs
Merge into:	lp:libdbusmenu/0.6
Diff against target:	28 lines (+3/-2) 2 files modified configure.ac (+2/-2) tests/Makefile.am (+1/-0)
To merge this branch:	bzr merge lp:~ted/libdbusmenu/valgrind-no-libs
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)		2012-04-02	Approve on 2012-04-02
Review via email: mp+100423@code.launchpad.net