From a4314139d588a7bee5e7c7da31a3b865b5b9b1e8 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 16 May 2012 16:22:30 +0200
Subject: [PATCH] Add egg-list-box as a submodule

---
 .gitmodules                 |  3 +++
 autogen.sh                  | 12 ++++++++++++
 configure.ac                | 10 ++++++++++
 libempathy-gtk/Makefile.am  |  4 ++++
 libempathy-gtk/egg-list-box |  1 +
 5 files changed, 30 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 libempathy-gtk/egg-list-box

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..f9047a05
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libempathy-gtk/egg-list-box"]
+	path = libempathy-gtk/egg-list-box
+	url = git://git.gnome.org/egg-list-box
diff --git a/autogen.sh b/autogen.sh
index 2753d641..b585c552 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,4 +18,16 @@ which gnome-autogen.sh || {
     exit 1
 }
 
+# Fetch submodules if needed
+if test ! -f libempathy-gtk/egg-list-box/COPYING;
+then
+  echo "+ Setting up submodules"
+  git submodule init
+fi
+git submodule update
+
+cd libempathy-gtk/egg-list-box
+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 3e8b3130..601c40a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,16 @@ CHEESE_GTK_REQUIRED=3.4.0
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
+# egg-list-box
+prev_top_build_prefix=$ac_top_build_prefix
+prev_ac_configure_args=$ac_configure_args
+AX_CONFIG_DIR([libempathy-gtk/egg-list-box])
+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"libempathy-gtk/egg-list-box
+PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box)
+
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 8fe8854e..e1ceceab 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = egg-list-box
+
 include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
@@ -15,6 +17,7 @@ AM_CPPFLAGS =                                           \
 	$(GEOCODE_CFLAGS)				\
 	$(MEEGO_CFLAGS)					\
 	$(CHEESE_CFLAGS)				\
+	$(EGGLISTBOX_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
@@ -183,6 +186,7 @@ libempathy_gtk_la_LIBADD =			\
 	$(GCR_LIBS)				\
 	$(MEEGO_LIBS)				\
 	$(CHEESE_LIBS)				\
+	$(top_builddir)/libempathy-gtk/egg-list-box/libegglistbox.la \
 	$(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \
diff --git a/libempathy-gtk/egg-list-box b/libempathy-gtk/egg-list-box
new file mode 160000
index 00000000..f43820e3
--- /dev/null
+++ b/libempathy-gtk/egg-list-box
@@ -0,0 +1 @@
+Subproject commit f43820e357546b2636308e944e6c77c803adabc8
-- 
2.39.2