aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-16 22:22:30 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-14 15:21:45 +0800
commita4314139d588a7bee5e7c7da31a3b865b5b9b1e8 (patch)
treefbc2e5a9adfc4e1f0420f52585097f03b1787be6
parentc85ceea55eef6e764d62c7b1cf1e536e60b67451 (diff)
downloadgsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.tar
gsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.tar.gz
gsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.tar.bz2
gsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.tar.lz
gsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.tar.xz
gsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.tar.zst
gsoc2013-empathy-a4314139d588a7bee5e7c7da31a3b865b5b9b1e8.zip
Add egg-list-box as a submodule
-rw-r--r--.gitmodules3
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac10
-rw-r--r--libempathy-gtk/Makefile.am4
m---------libempathy-gtk/egg-list-box0
5 files changed, 29 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..f9047a059
--- /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 2753d641c..b585c552f 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 3e8b31309..601c40a58 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 8fe8854e4..e1ceceabc 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
+Subproject f43820e357546b2636308e944e6c77c803adabc