[gnome-online-accounts/wip/inigomartinez/meson: 1/3] build: Move telepathy-account-widgets to subprojects

[Iñigo Martínez <inigomartinez src gnome org>]

commit ef031a0071ae80770bda90367fe2af06978cd587
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Sep 11 10:52:32 2017 +0200

    build: Move telepathy-account-widgets to subprojects
    
    In order to ease the meson build port, the telepathy-account-widgets
    module has been moved to subprojects directory.
    
    autotools files have also been modified to locate the module properly
    at the new directory.

 .gitmodules                                        |    4 ++--
 Makefile.am                                        |    2 +-
 autogen.sh                                         |    5 ++---
 configure.ac                                       |    4 ++--
 po/POTFILES.skip                                   |    2 +-
 .../telepathy-account-widgets                      |    0
 6 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 6c30dad..05b4d5d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "telepathy-account-widgets"]
-       path = telepathy-account-widgets
+[submodule "subprojects/telepathy-account-widgets"]
+       path = subprojects/telepathy-account-widgets
        url = git://git.gnome.org/telepathy-account-widgets.git
diff --git a/Makefile.am b/Makefile.am
index dfaf844..11e7b87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = data
 
 if BUILD_BACKEND
 if BUILD_TELEPATHY
-SUBDIRS += telepathy-account-widgets
+SUBDIRS += subprojects/telepathy-account-widgets
 endif
 endif
 
diff --git a/autogen.sh b/autogen.sh
index eed9682..dc472cf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,16 +24,15 @@ fi
 
 git submodule update --init --recursive
 
-cd $srcdir/telepathy-account-widgets
+cd $srcdir/subprojects/telepathy-account-widgets
 NOCONFIGURE=1 sh autogen.sh
-cd ..
+cd "$olddir"
 
 aclocal --install || exit 1
 gtkdocize --copy || exit 1
 intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install || exit 1
 
-cd "$olddir"
 if [ "$NOCONFIGURE" = "" ]; then
        $srcdir/configure "$@" || exit 1
 
diff --git a/configure.ac b/configure.ac
index 089904b..caaf29a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,11 +161,11 @@ if test "$enable_backend" != "no"; then
     # Disable the installation of the GSettings schema to avoid multiple components shipping
     # the same file. See https://bugzilla.gnome.org/show_bug.cgi?id=706803
     ac_configure_args="$ac_configure_args --disable-schemas-compile --disable-settings"
-    AX_CONFIG_DIR([telepathy-account-widgets])
+    AX_CONFIG_DIR([subprojects/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/
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"subprojects/telepathy-account-widgets/
     PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
   fi
 fi
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2638b4d..820817a 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,4 +2,4 @@
 # Please keep this file sorted alphabetically.
 data/goa-daemon.desktop.in
 
-telepathy-account-widgets
+subprojects/telepathy-account-widgets
diff --git a/telepathy-account-widgets b/subprojects/telepathy-account-widgets
similarity index 100%
rename from telepathy-account-widgets
rename to subprojects/telepathy-account-widgets