Merge lp:~ballogy/overlay-scrollbar/make-tests-optional into lp:overlay-scrollbar

[Balló György]

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

[Andrea Cimitan (cimi)]

I'd rather use a different name instead WANT_TESTS... I don't know, ENABLE_TESTS or DISABLE_TESTS?

[Andrea Cimitan (cimi)]

Or others... but thanks, looks nice!

[Andrea Cimitan (cimi)]

Merged with ENABLE_TESTS

=== modified file 'Makefile.am'
--- Makefile.am	2011-04-21 14:33:22 +0000
+++ Makefile.am	2011-11-27 02:22:02 +0000
@@ -3,8 +3,11 @@
 	data \
 	build \
 	pkgconfig \
-	os \
-	tests
+	os
+
+if WANT_TESTS
+SUBDIRS += tests
+endif
 
 ACLOCAL_AMFLAGS = -I build
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-10-19 15:35:09 +0000
+++ configure.ac	2011-11-27 02:22:02 +0000
@@ -88,6 +88,12 @@
 )
 AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
 
+# 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"])
+
 # Debug flags
 
 if test x$OS_TRUNK = xyes; then
@@ -171,6 +177,7 @@
 echo "  ========================="
 echo ""
 echo "  Gtk+:   ${with_gtk}"
+echo "  Tests:  ${enable_tests}"
 echo "  Debug:  ${enable_debug}"
 echo "  Prefix: ${prefix}"
 echo ""