stop exporting FAVOURITE_CONTACTS_CFLAGS and FAVOURITE_CONTACTS_LIBS

diff --git a/configure.ac b/configure.ac
index 6aac784dbb5bc06089d898381c6d5a8b15be493f..952ff13cdf194e24be1a3b621c540ef2f63668be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -483,8 +483,6 @@ if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" !=
 fi
 
 AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
-AC_SUBST(FAVOURITE_CONTACTS_CFLAGS)
-AC_SUBST(FAVOURITE_CONTACTS_LIBS)
 
 # -----------------------------------------------------------
 # nautilus-sendto

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2df40010360c72bd8ba1b61230621dd524b6266b..6ec319e1ca5469009d14a6f19ee81330ade72dc3 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS =                                           \
        $(LIBNOTIFY_CFLAGS)                             \
        $(ENCHANT_CFLAGS)                               \
        $(LIBCHAMPLAIN_CFLAGS)                          \
-       $(FAVOURITE_CONTACTS_CFLAGS)                    \
        $(GEOCLUE_CFLAGS)                               \
        $(MEEGO_CFLAGS)                         \
        $(WEBKIT_CFLAGS)                                \
@@ -136,7 +135,6 @@ libempathy_gtk_la_LIBADD =                  \
        $(TPL_LIBS)                             \
        $(ENCHANT_LIBS)                         \
        $(LIBCHAMPLAIN_LIBS)                    \
-       $(FAVOURITE_CONTACTS_LIBS)              \
        $(GEOCLUE_LIBS)                         \
        $(MEEGO_LIBS)                           \
        $(WEBKIT_LIBS)                          \

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 057203bd377127ecb69e8f0fdbcbdecac7932649..1f1423952a5e0543f4e2a7100bd31199ae98fe55 100644 (file)
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS =                                           \
        -DG_LOG_DOMAIN=\"empathy\"                      \
        $(TPL_CFLAGS)                                   \
        $(LIBEMPATHY_CFLAGS)                            \
-       $(FAVOURITE_CONTACTS_CFLAGS)                    \
        $(GEOCLUE_CFLAGS)                               \
        $(NETWORK_MANAGER_CFLAGS)                       \
        $(CONNMAN_CFLAGS)                               \
@@ -120,7 +119,6 @@ nodist_libempathy_la_SOURCES =\
 libempathy_la_LIBADD =         \
        $(top_builddir)/extensions/libemp-extensions.la \
        $(LIBEMPATHY_LIBS) \
-       $(FAVOURITE_CONTACTS_LIBS) \
        $(GEOCLUE_LIBS) \
        $(TPL_LIBS) \
        $(NETWORK_MANAGER_LIBS) \