[tracker/configure-for-binaries: 66/77] libtracker-common: Add HAL/UPOWER to CFLAGS/LIBS in configure

[Martyn James Russell <mr src gnome org>]

commit 4da141b27bc1eedf6bf6218ebba05fbfaef661a2
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 26 10:29:55 2010 +0100

    libtracker-common: Add HAL/UPOWER to CFLAGS/LIBS in configure

 configure.ac                      |   12 +++++++-----
 src/libtracker-common/Makefile.am |   11 +++--------
 2 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 257f228..e77b978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -731,10 +731,11 @@ AC_ARG_ENABLE(upower,
 if test "x$enable_upower" != "xno"; then
    PKG_CHECK_MODULES(UPOWER,
                      [upower-glib >= $UPOWER_REQUIRED],
-                     [have_upower=yes] ,
+                     [have_upower=yes],
                      [have_upower=no])
-   AC_SUBST(UPOWER_CFLAGS)
-   AC_SUBST(UPOWER_LIBS)
+
+   LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $UPOWER_CFLAGS"
+   LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $UPOWER_LIBS"
 
    if test "x$have_upower" = "xyes"; then
       AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPOWER])
@@ -765,8 +766,9 @@ if test "x$have_upower" != "xyes" && test "x$enable_hal" != "xno"; then
                      [hal >= $HAL_REQUIRED],
                      [have_hal=yes] ,
                      [have_hal=no])
-   AC_SUBST(HAL_CFLAGS)
-   AC_SUBST(HAL_LIBS)
+
+   LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $HAL_CFLAGS"
+   LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $HAL_LIBS"
 
    if test "x$have_hal" = "xyes"; then
       AC_DEFINE(HAVE_HAL, [], [Define if we have HAL])
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index c72423b..6ebb9f2 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -2,10 +2,8 @@ include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS =						\
 	$(BUILD_CFLAGS)					\
-	-DSHAREDIR=\""$(datadir)"\"			\
 	-I$(top_srcdir)/src				\
-	$(HAL_CFLAGS)					\
-	$(UPOWER_CFLAGS)				\
+	-DSHAREDIR=\""$(datadir)"\"			\
 	$(LIBTRACKER_COMMON_CFLAGS)
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
@@ -75,9 +73,7 @@ libtracker_common_la_LDFLAGS = 				\
 
 libtracker_common_la_LIBADD = 				\
 	$(BUILD_LIBS)					\
-	$(LIBTRACKER_COMMON_LIBS)			\
-	$(HAL_LIBS)					\
-	$(UPOWER_LIBS)
+	$(LIBTRACKER_COMMON_LIBS)
 
 if HAVE_TRACKER_FTS
 libtracker_common_la_LIBADD += 				\
@@ -95,8 +91,7 @@ tracker-marshal.c: tracker-marshal.list
 	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ &&	\
 		   $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
-BUILT_SOURCES =						\
-	$(marshal_sources)
+BUILT_SOURCES =	$(marshal_sources)
 
 CLEANFILES = $(marshal_sources)