diff -Naur libnotify-0.7.4/configure.ac libnotify-0.7.4-magellan/configure.ac --- libnotify-0.7.4/configure.ac 2011-08-28 00:45:52.000000000 +0200 +++ libnotify-0.7.4-magellan/configure.ac 2012-03-10 20:00:02.591982796 +0100 @@ -93,8 +93,13 @@ AC_SUBST([pkg_modules]) PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) +AC_ARG_ENABLE([tests], + AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests])) +AS_IF([test $enable_tests = yes], [ tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION" PKG_CHECK_MODULES(TESTS, [$tests_modules]) +]) +AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes]) GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) diff -Naur libnotify-0.7.4/tests/Makefile.am libnotify-0.7.4-magellan/tests/Makefile.am --- libnotify-0.7.4/tests/Makefile.am 2011-08-16 13:52:04.000000000 +0200 +++ libnotify-0.7.4-magellan/tests/Makefile.am 2012-03-10 20:03:12.274982796 +0100 @@ -2,18 +2,15 @@ -I$(top_srcdir) \ $(TESTS_CFLAGS) -noinst_PROGRAMS = \ +check_PROGRAMS = \ test-replace \ - test-replace-widget \ test-server-info \ test-default-action \ test-multi-actions \ test-action-icons \ - test-image \ test-basic \ test-error \ test-markup \ - test-persistence \ test-removal \ test-resident \ test-rtl \ @@ -24,6 +21,22 @@ test-xy-actions \ test-xy-stress +#if MORE_TESTS +check_PROGRAMS += \ + test-image \ + test-replace-widget \ + test-persistence + +test_replace_widget_SOURCES = test-replace-widget.c +test_replace_widget_LDADD = $(common_ldflags) + +test_image_SOURCES = test-image.c +test_image_LDADD = $(common_ldflags) + +test_persistence_SOURCES = test-persistence.c +test_persistence_LDADD = $(common_ldflags) +#endif + common_ldflags = \ $(top_builddir)/libnotify/libnotify.la \ $(TESTS_LIBS) @@ -31,9 +44,6 @@ test_replace_SOURCES = test-replace.c test_replace_LDADD = $(common_ldflags) -test_replace_widget_SOURCES = test-replace-widget.c -test_replace_widget_LDADD = $(common_ldflags) - test_server_info_SOURCES = test-server-info.c test_server_info_LDADD = $(common_ldflags) @@ -49,9 +59,6 @@ test_action_icons_SOURCES = test-action-icons.c test_action_icons_LDADD = $(common_ldflags) -test_image_SOURCES = test-image.c -test_image_LDADD = $(common_ldflags) - test_basic_SOURCES = test-basic.c test_basic_LDADD = $(common_ldflags) @@ -76,9 +83,6 @@ test_rtl_SOURCES = test-rtl.c test_rtl_LDADD = $(common_ldflags) -test_persistence_SOURCES = test-persistence.c -test_persistence_LDADD = $(common_ldflags) - test_removal_SOURCES = test-removal.c test_removal_LDADD = $(common_ldflags)