[tracker/tracker-0.12: 3/202] configure.ac: define BUILD_ flags and libs after GCov checking

[Martyn James Russell <mr src gnome org>]

commit 630e309e6c964a2fbd7fcb389d72b367ee72637c
Author: Ivan Frade <ivan frade gmail com>
Date:   Fri Sep 9 16:34:42 2011 +0300

    configure.ac: define BUILD_ flags and libs after GCov checking
    
    Otherwise the gcov flags are never set and it is not possible to get
    test coverage results.

 configure.ac                  |   21 ++++++++++++---------
 utils/tracker-sql/Makefile.am |    1 +
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6311bb7..d751619 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,15 +516,6 @@ PKG_CHECK_MODULES(TRACKER_NAUTILUS_EXTENSION, [$TRACKER_NAUTILUS_EXTENSION_REQUI
                   [have_tracker_nautilus_extension=yes],
                   [have_tracker_nautilus_extension=no])
 
-# General VALAFLAGS/CFLAGS/LIBS
-BUILD_VALAFLAGS="-g --target-glib=2.26"
-BUILD_CFLAGS="${WARN_CFLAGS} ${GCOV_CFLAGS} -DG_LOG_DOMAIN=\\\"Tracker\\\" -DTRACKER_COMPILATION"
-BUILD_LIBS="${GCOV_LIBS}"
-
-AC_SUBST(BUILD_VALAFLAGS)
-AC_SUBST(BUILD_CFLAGS)
-AC_SUBST(BUILD_LIBS)
-
 # Check we have Vala valac command we need
 AC_PATH_PROG(VALAC, valac, valac)
 if test -z $VALAC; then
@@ -570,6 +561,18 @@ AC_SUBST(GCOV_CFLAGS)
 AC_SUBST(GCOV_LIBS)
 
 ####################################################################
+# General VALAFLAGS/CFLAGS/LIBS
+####################################################################
+BUILD_VALAFLAGS="-g --target-glib=2.26"
+BUILD_CFLAGS="${WARN_CFLAGS} ${GCOV_CFLAGS} -DG_LOG_DOMAIN=\\\"Tracker\\\" -DTRACKER_COMPILATION"
+BUILD_LIBS="${GCOV_LIBS}"
+
+AC_SUBST(BUILD_VALAFLAGS)
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_LIBS)
+
+
+####################################################################
 # Check for functional-test include/exclude
 ####################################################################
 AC_ARG_ENABLE([functional-tests],
diff --git a/utils/tracker-sql/Makefile.am b/utils/tracker-sql/Makefile.am
index b86feca..452e7a1 100644
--- a/utils/tracker-sql/Makefile.am
+++ b/utils/tracker-sql/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =                                             \
 	$(TRACKER_UTILS_CFLAGS)
 
 LDADD =                                                \
+	$(BUILD_LIBS)					\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql- TRACKER_API_VERSION@.la \