Merge lp:~ballogy/bamf/make-tests-optional into lp:bamf/0.4

[Balló György]

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

[lp:~ballogy/bamf/make-tests-optional]

420. By Balló György on 2011-11-20

Make building tests optional

[Marco Trevisan (Treviño) (3v1n0)]

Please, update your patch against trunk to get it merged.

Unmerged revisions

420. By Balló György on 2011-11-20

Make building tests optional

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-01 23:02:54 +0000
+++ Makefile.am	2011-11-20 01:31:23 +0000
@@ -3,11 +3,15 @@
 SUBDIRS = \
   lib/libbamf \
   src \
+  data \
+  doc
+
+if WANT_TESTS
+SUBDIRS += \
   tests/functional \
   tests/bamfdaemon \
-  tests/libbamf \
-  data \
-  doc
+  tests/libbamf
+endif
 
 EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk m4/i18n.m4 m4/programs.m4 m4/util.m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc

=== modified file 'configure.in'
--- configure.in	2011-09-26 11:45:52 +0000
+++ configure.in	2011-11-20 01:31:23 +0000
@@ -124,6 +124,14 @@
   AM_PATH_GTK_3_0
 fi
 
+#
+# Check if build tests
+#
+AC_ARG_ENABLE([tests],
+	AC_HELP_STRING([--disable-tests], [Disable tests]),,
+	[enable_tests=yes])
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
+
 dnl CFLAGS
 CFLAGS="$CFLAGS -Wall -Werror -lm"
 
@@ -157,4 +165,5 @@
   Build Environment
     Install Prefix:     ${prefix}
     GTK+ Version:       ${with_gtk}
+    Tests:              ${enable_tests}
 EOF