libindicate

Merge lp:~ballogy/libindicate/make-tests-optional into lp:libindicate/0.7

  1. make-tests-optional
  2. Merge into trunk.0.7
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 439
Merged at revision: 440
Proposed branch: lp:~ballogy/libindicate/make-tests-optional
Merge into: lp:libindicate/0.7
Diff against target: 45 lines (+17/-1)
2 files modified
Makefile.am (+4/-1)
configure.ac (+13/-0)
To merge this branch: bzr merge lp:~ballogy/libindicate/make-tests-optional
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+92312@code.launchpad.net

This proposal supersedes a proposal from 2011-11-21.

Description of the change

This change makes it possible to disable building tests with '--disable-tests' configure switch.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2011-09-20 03:51:52 +0000
3+++ Makefile.am 2012-02-09 16:36:17 +0000
4@@ -13,9 +13,12 @@
5 $(LIBINDICATEGTK_SUBDIR) \
6 bindings \
7 examples \
8- tests \
9 $(DOC_SUBDIR)
10
11+if WANT_TESTS
12+SUBDIRS += tests
13+endif
14+
15 EXTRA_DIST = \
16 COPYING.LGPL.2.1 \
17 gtk-doc.make \
18
19=== modified file 'configure.ac'
20--- configure.ac 2011-09-20 04:26:16 +0000
21+++ configure.ac 2012-02-09 16:36:17 +0000
22@@ -237,6 +237,14 @@
23 ])
24 GNOME_COMPILE_WARNINGS
25
26+#########################
27+# Check if build tests
28+#########################
29+AC_ARG_ENABLE([tests],
30+ AC_HELP_STRING([--disable-tests], [Disable tests]),,
31+ [enable_tests=yes])
32+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
33+
34 ##############################
35 # Custom Junk
36 ##############################
37@@ -349,3 +357,8 @@
38 [AC_MSG_NOTICE([ Gtk: no])],
39 [AC_MSG_NOTICE([ Gtk: yes])]
40 )
41+
42+AS_IF([test "x$enable_tests" != "xno"],
43+ [AC_MSG_NOTICE([ Tests: yes])],
44+ [AC_MSG_NOTICE([ Tests: no])]
45+)

Subscribers

People subscribed via source and target branches