Use the telepathy-account-widgets submodule instead of the internal copy

https://bugzilla.gnome.org/show_bug.cgi?id=699492

9 files changed, 30 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 0a8b1cb32..28e6374d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
-MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
-TPAW_SUBDIRS = tp-account-widgets
+MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
 NST_SUBDIRS = nautilus-sendto-plugin
 GOA_SUBDIRS = goa-mc-plugin
 UOA_SUBDIRS = ubuntu-online-accounts
 
-DIST_SUBDIRS = $(TPAW_SUBDIRS) $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
+DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
 
-SUBDIRS = $(TPAW_SUBDIRS) $(MY_SUBDIRS)
+SUBDIRS = $(MY_SUBDIRS)
 
 if HAVE_NST
 SUBDIRS += $(NST_SUBDIRS)
diff --git a/autogen.sh b/autogen.sh
index b585c552f..0fcb6fd78 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ which gnome-autogen.sh || {
 }
 
 # Fetch submodules if needed
-if test ! -f libempathy-gtk/egg-list-box/COPYING;
+if test ! -f libempathy-gtk/egg-list-box/COPYING -o ! -f telepathy-account-widgets/COPYING;
 then
   echo "+ Setting up submodules"
   git submodule init
@@ -30,4 +30,8 @@ cd libempathy-gtk/egg-list-box
 sh autogen.sh --no-configure
 cd ../..
 
+cd telepathy-account-widgets
+sh autogen.sh --no-configure
+cd ..
+
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index d0291e615..661577e37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,16 @@ MC_PLUGINS_REQUIRED=5.13.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
+# tp-account-widgets
+prev_top_build_prefix=$ac_top_build_prefix
+prev_ac_configure_args=$ac_configure_args
+AX_CONFIG_DIR([telepathy-account-widgets])
+ac_top_build_prefix=$prev_top_build_prefix
+ac_configure_args=$prev_ac_configure_args
+
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
+PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
+
 # egg-list-box
 prev_top_build_prefix=$ac_top_build_prefix
 prev_ac_configure_args=$ac_configure_args
@@ -637,7 +647,6 @@ AC_CONFIG_FILES([
    data/themes/Makefile
    extensions/Makefile
    po/Makefile.in
-   tp-account-widgets/Makefile
    libempathy/Makefile
    libempathy-gtk/Makefile
    src/Makefile
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 19e07d505..bd83eef64 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -4,13 +4,13 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)/tp-account-widgets		\
 	-I$(top_srcdir)/libempathy			\
 	-I$(top_srcdir)/extensions			\
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(YELL_CFLAGS)					\
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
@@ -168,6 +168,7 @@ nodist_libempathy_gtk_la_SOURCES =\
 libempathy_gtk_la_LIBADD =			\
 	$(EMPATHY_LIBS)			\
 	$(EMPATHY_LIBS)			\
+	$(TPAW_LIBS)			\
 	$(GTK_LIBS)			\
 	$(LIBNOTIFY_LIBS)			\
 	$(CANBERRA_LIBS) \
@@ -178,7 +179,6 @@ libempathy_gtk_la_LIBADD =			\
 	$(GCR_LIBS)				\
 	$(MEEGO_LIBS)				\
 	$(CHEESE_LIBS)				\
-	$(top_builddir)/tp-account-widgets/libtp-account-widgets.la \
 	$(top_builddir)/libempathy-gtk/egg-list-box/libegglistbox.la \
 	$(top_builddir)/libempathy/libempathy.la
 
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index e7dbd7f86..267781185 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS =                                           \
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(GEOCLUE_CFLAGS)				\
 	$(GEOCODE_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
@@ -107,6 +108,7 @@ libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
 	$(GCR_LIBS) \
 	$(EMPATHY_LIBS) \
+	$(TPAW_LIBS) \
 	$(GEOCLUE_LIBS) \
 	$(GEOCODE_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index a28415cc1..0bd286f6d 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =					\
 	$(WARN_CFLAGS)				\
 	$(ERROR_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
+	$(TPAW_CFLAGS)				\
 	$(EMPATHY_CFLAGS)
 
 plugin_LTLIBRARIES = libnstempathy.la
@@ -17,5 +18,6 @@ libnstempathy_la_SOURCES = empathy-nautilus-sendto.c
 libnstempathy_la_LDFLAGS = -module -avoid-version
 libnstempathy_la_LIBADD =				\
 	$(NST_LIBS)					\
+	$(TPAW_LIBS)					\
 	$(top_builddir)/libempathy/libempathy.la \
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
diff --git a/src/Makefile.am b/src/Makefile.am
index fdc95844d..e7644774e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)/tp-account-widgets		\
 	-I$(top_srcdir)/libempathy-gtk			\
 	-I$(top_srcdir)/libempathy			\
 	-I$(top_srcdir)/extensions			\
@@ -23,12 +23,12 @@ AM_CPPFLAGS =						\
 	$(NULL)
 
 LDADD =								\
-	$(top_builddir)/tp-account-widgets/libtp-account-widgets.la \
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
 	$(top_builddir)/extensions/libemp-extensions.la		\
 	$(GCR_LIBS) 						\
 	$(EMPATHY_LIBS)						\
+	$(TPAW_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
 	$(UOA_LIBS)						\
 	$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 679aa55e2..eba5c022f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,21 +10,21 @@ EXTRA_DIST = 		\
 
 AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)/tp-account-widgets		\
 	-I$(top_srcdir)/libempathy                     	\
 	-I$(top_srcdir)/libempathy-gtk                 	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)				\
 	-DSRCDIR=\""$(abs_srcdir)"\"			\
 	$(NULL)
 
 LDADD =								\
-	$(top_builddir)/tp-account-widgets/libtp-account-widgets.la	\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
+	$(TPAW_LIBS)						\
 	$(EMPATHY_LIBS)						\
 	$(NULL)
 
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 86d8fe1c3..e1236f4ba 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,17 +1,17 @@
 AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)/tp-account-widgets		\
 	-I$(top_srcdir)/libempathy                     	\
 	-I$(top_srcdir)/libempathy-gtk                 	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 LDADD =								\
-	$(top_builddir)/tp-account-widgets/libtp-account-widgets.la	\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
+	$(TPAW_LIBS)						\
 	$(EMPATHY_LIBS)
 
 noinst_PROGRAMS =			\