2009-02-23 Claudio Saavedra <csaavedra@igalia.com>

Patch by Sven Herzberg (sven@imendio.com)

	* configure.ac: Add missing AM_PROG_CC_C_0
	* tests/Makefile.am: Use an appropriate variable name instead of TESTS.

	See NB#101420 (Update unit tests and fix make check)

diff --git a/ChangeLog b/ChangeLog
index c442106..9d2ee4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-23  Claudio Saavedra  <csaavedra@igalia.com>
+
+       Patch by Sven Herzberg (sven@imendio.com)
+
+       * configure.ac: Add missing AM_PROG_CC_C_0
+       * tests/Makefile.am: Use an appropriate variable name instead of TESTS.
+
+       See NB#101420 (Update unit tests and fix make check)
+
 2009-02-23  Alejandro G. Castro  <alex@igalia.com>
 
        This patch was applied before but reverted because it caused

diff --git a/configure.ac b/configure.ac
index e556b42..1d1753e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AS_LIBTOOL(HILDON, 18, 7, 18)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_AWK

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eff6759..e04d4d3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,8 +3,9 @@ MAINTAINERCLEANFILES                                    = Makefile.in
 if BUILD_TESTS
 
 noinst_PROGRAMS                                = check_test
+TESTS                                  = check_test
 
-TESTS                                  = check_test.c                          \
+tests                                  = check_test.c                          \
                                          check_utils.c                         \
                                          check-hildon-caption.c                \
                                          check-hildon-helper.c                 \
@@ -34,9 +35,9 @@ DEPRECATED_TESTS                      = check-hildon-range-editor.c           \
                                          check-hildon-color-chooser.c
 
 if HILDON_DISABLE_DEPRECATED
-check_test_SOURCES                     = $(TESTS)
+check_test_SOURCES                     = $(tests)
 else
-check_test_SOURCES                     = $(TESTS)                              \
+check_test_SOURCES                     = $(tests)                              \
                                          $(DEPRECATED_TESTS)
 endif