[tracker/collation: 1/9] build: use common LIBS and CFLAGS for all unicode support options

[Aleksander Morgado <aleksm src gnome org>]

commit 4640927487e0d47003306e29b29d2fe0d6318ccc
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Thu Aug 19 13:35:57 2010 +0200

    build: use common LIBS and CFLAGS for all unicode support options

 configure.ac                   |   20 +++++++++++++-------
 src/libtracker-fts/Makefile.am |   26 ++++----------------------
 2 files changed, 17 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ddabbd1..d8e4114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -852,7 +852,7 @@ AC_CHECK_HEADER(unicode/ubrk.h,
                 [have_libicu=yes],
                 [have_libicu=no])
 LIBICU_CFLAGS=""
-LIBICU_LIBS="-licuuc"
+LIBICU_LIBS="-licuuc -licui18n"
 
 # Check for Pango...
 PKG_CHECK_MODULES(PANGO,
@@ -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-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)