Add egg-list-box as a submodule

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..f9047a0
--- /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 2753d641cd2f4b1a0e0b498b788f0e63365a1869..b585c552ff51313bbf44cb99cbbbfe76aa920ba2 100755 (executable)
--- 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 3e8b313098bde27194004254d6ecfa6bd0f9906f..601c40a583e4f492f6dd06ac205484369a81e2f3 100644 (file)
--- 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 8fe8854e4cb443026dd0211b6abd233be367fb51..e1ceceabc000ee373cd2efd45c50ba465aef615a 100644 (file)
--- 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 (submodule)
index 0000000..f43820e
--- /dev/null
+++ b/libempathy-gtk/egg-list-box
@@ -0,0 +1 @@
+Subproject commit f43820e357546b2636308e944e6c77c803adabc8