[tracker/collation: 3/6] Use common LIBS and CFLAGS for unicode support

[Aleksander Morgado <aleksm src gnome org>]

commit 17c366cdf2a1e5cce52626b11971095a017407b7
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Aug 16 15:41:15 2010 +0200

    Use common LIBS and CFLAGS for unicode support

 configure.ac                      |   18 ++++++++++++------
 src/libtracker-common/Makefile.am |    6 ++++--
 src/libtracker-fts/Makefile.am    |   26 ++++----------------------
 3 files changed, 20 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a098bee..fb858d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -883,11 +883,14 @@ if test "x$with_unicode_support" = "xauto"; then
    fi
 fi
 
+UNICODE_SUPPORT_CFLAGS=
+UNICODE_SUPPORT_LIBS=
+
 case "x$with_unicode_support" in
      # Use libunistring
      "xlibunistring")
-        AC_SUBST(LIBUNISTRING_CFLAGS)
-        AC_SUBST(LIBUNISTRING_LIBS)
+        UNICODE_SUPPORT_CFLAGS=$LIBUNISTRING_CFLAGS
+        UNICODE_SUPPORT_LIBS=$LIBUNISTRING_LIBS
         if test "x$have_libunistring" = "xyes"; then
            AC_DEFINE(HAVE_LIBUNISTRING, [1], [libunistring Unicode support library])
         else
@@ -896,8 +899,8 @@ case "x$with_unicode_support" in
      ;;
      # Use libicu
      "xlibicu")
-        AC_SUBST(LIBICU_CFLAGS)
-        AC_SUBST(LIBICU_LIBS)
+        UNICODE_SUPPORT_CFLAGS=$LIBICU_CFLAGS
+        UNICODE_SUPPORT_LIBS=$LIBICU_LIBS
         if test "x$have_libicu" = "xyes"; then
           AC_DEFINE(HAVE_LIBICU, [1], [libicu Unicode support library])
         else
@@ -906,8 +909,8 @@ case "x$with_unicode_support" in
      ;;
      # Use glib/pango
      "xglib")
-        AC_SUBST(PANGO_CFLAGS)
-        AC_SUBST(PANGO_LIBS)
+        UNICODE_SUPPORT_CFLAGS=$PANGO_CFLAGS
+        UNICODE_SUPPORT_LIBS=$PANGO_LIBS
         if test "x$have_pango" != "xyes"; then
           AC_MSG_ERROR([Couldn't find pango])
         fi
@@ -919,6 +922,9 @@ esac
 AM_CONDITIONAL(BUILD_LIBUNISTRING_PARSER, test "x$with_unicode_support" = "xlibunistring")
 AM_CONDITIONAL(BUILD_LIBICU_PARSER, test "x$with_unicode_support" = "xlibicu")
 
+AC_SUBST(UNICODE_SUPPORT_CFLAGS)
+AC_SUBST(UNICODE_SUPPORT_LIBS)
+
 ####################################################################
 # Miner Evolution
 ####################################################################
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 3e36719..4f02c30 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -11,7 +11,8 @@ INCLUDES =						\
 	$(GIO_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(UPOWER_CFLAGS)				\
-	$(DBUS_CFLAGS)
+	$(DBUS_CFLAGS)					\
+	$(UNICODE_SUPPORT_CFLAGS)
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_common_LTLIBRARIES = libtracker-common.la
@@ -86,7 +87,8 @@ libtracker_common_la_LIBADD = 				\
 	$(DBUS_LIBS)					\
 	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
-	$(GLIB2_LIBS)
+	$(GLIB2_LIBS)					\
+	$(UNICODE_SUPPORT_LIBS)
 
 if HAVE_TRACKER_FTS
 libtracker_common_la_LIBADD += 				\
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index bb4a097..02032f6 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -9,17 +9,8 @@ INCLUDES =								\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(UNAC_CFLAGS)							\
-	$(SQLITE3_CFLAGS)
-
-if BUILD_LIBUNISTRING_PARSER
-  INCLUDES += $(LIBUNISTRING_CFLAGS)
-else
-if BUILD_LIBICU_PARSER
-  INCLUDES += $(LIBICU_CFLAGS)
-else
-  INCLUDES += $(PANGO_CFLAGS)
-endif
-endif
+	$(SQLITE3_CFLAGS)						\
+	$(UNICODE_SUPPORT_CFLAGS)
 
 noinst_LTLIBRARIES = libtracker-fts.la
 
@@ -51,14 +42,5 @@ libtracker_fts_la_LIBADD =						\
 	$(GTHREAD_LIBS)							\
 	$(GCOV_LIBS)							\
 	$(UNAC_LIBS)							\
-	$(GLIB2_LIBS)
-
-if BUILD_LIBUNISTRING_PARSER
-  libtracker_fts_la_LIBADD += $(LIBUNISTRING_LIBS)
-else
-if BUILD_LIBICU_PARSER
-  libtracker_fts_la_LIBADD += $(LIBICU_LIBS)
-else
-  libtracker_fts_la_LIBADD += $(PANGO_LIBS)
-endif
-endif
+	$(GLIB2_LIBS)							\
+	$(UNICODE_SUPPORT_LIBS)