[gnome-online-accounts] build: add the telepathy-account-widgets submodule

[Marco Barisione <mbari src gnome org>]

commit 8b592e291ad1241743483926e3036a22557c94c3
Author: Marco Barisione <marco barisione collabora co uk>
Date:   Fri Jun 28 18:44:26 2013 +0100

    build: add the telepathy-account-widgets submodule
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696267

 .gitmodules                |    3 +++
 Makefile.am                |    2 +-
 autogen.sh                 |    6 ++++++
 configure.ac               |   11 +++++++++++
 src/goabackend/Makefile.am |    2 ++
 telepathy-account-widgets  |    1 +
 6 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6c30dad
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "telepathy-account-widgets"]
+       path = telepathy-account-widgets
+       url = git://git.gnome.org/telepathy-account-widgets.git
diff --git a/Makefile.am b/Makefile.am
index 4a15473..354c316 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 
 NULL =
 
-SUBDIRS = data src doc po
+SUBDIRS = data telepathy-account-widgets src doc po
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
diff --git a/autogen.sh b/autogen.sh
index 265d757..519fcce 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,10 @@ which gnome-autogen.sh || {
     exit 1
 }
 
+git submodule update --init --recursive
+
+cd telepathy-account-widgets
+sh autogen.sh --no-configure
+cd ..
+
 . gnome-autogen.sh --enable-gtk-doc "$@"
diff --git a/configure.ac b/configure.ac
index 3bc8e8f..1580961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,17 @@ AC_SUBST(LIBXML_LIBS)
 
 GOBJECT_INTROSPECTION_CHECK([0.6.2])
 
+# telepathy-account-widgets
+prev_top_build_prefix=$ac_top_build_prefix
+prev_ac_configure_args=$ac_configure_args
+ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/gnome-online-accounts --with-cheese=no 
--disable-gudev"
+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)
+
 # service providers
 #
 
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 4049799..01bb586 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -107,6 +107,7 @@ libgoa_backend_1_0_la_CFLAGS =                                      \
        $(SECRET_CFLAGS)                                        \
        $(LIBSOUP_CFLAGS)                                       \
        $(LIBXML_CFLAGS)                                        \
+       $(TPAW_CFLAGS)                                          \
        $(NULL)
 
 libgoa_backend_1_0_la_LIBADD =                                         \
@@ -120,6 +121,7 @@ libgoa_backend_1_0_la_LIBADD =                                      \
        $(SECRET_LIBS)                                          \
        $(LIBSOUP_LIBS)                                         \
        $(LIBXML_LIBS)                                          \
+       $(TPAW_LIBS)                                            \
        $(NULL)
 
 # ----------------------------------------------------------------------------------------------------
diff --git a/telepathy-account-widgets b/telepathy-account-widgets
new file mode 160000
index 0000000..884bf56
--- /dev/null
+++ b/telepathy-account-widgets
@@ -0,0 +1 @@
+Subproject commit 884bf560b4c985fb813d8153ae1cb8a4960193ee