[baobab] Import libgd as git submodule

[Stefano Facchini <sfacchini src gnome org>]

commit 39f670c96e40f009cfb3b6282f258d680c2c2e0a
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Sat Sep 8 00:05:26 2012 +0200

    Import libgd as git submodule

 .gitmodules     |    3 +++
 Makefile.am     |    4 ++--
 configure.ac    |   14 ++++++++++++--
 libgd           |    1 +
 src/Makefile.am |   12 ++++++++----
 5 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..bfd964e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+	path = libgd
+	url = git://git.gnome.org/libgd
diff --git a/Makefile.am b/Makefile.am
index 8bd7c0e..4cafdfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 NULL =
 
-SUBDIRS =  src data pixmaps help po
+SUBDIRS =  libgd src data pixmaps help po
 
 EXTRA_DIST = COPYING.docs
 
diff --git a/configure.ac b/configure.ac
index 8723764..2087fb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,8 +43,17 @@ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 # Mallard help
 YELP_HELP_INIT
 
-PKG_CHECK_MODULES(gtk, gtk+-3.0 >= 3.5.9)
-PKG_CHECK_MODULES(gio, gio-2.0 >= 2.30.0)
+PKG_CHECK_MODULES(BAOBAB, [
+    gtk+-3.0 >= 3.5.9
+    gio-2.0 >= 2.30.0
+])
+
+LT_INIT([disable-static])
+
+LIBGD_INIT([
+    main-toolbar
+    vapi
+])
 
 AC_CONFIG_FILES([
 Makefile
@@ -52,6 +61,7 @@ data/Makefile
 help/Makefile
 pixmaps/Makefile
 src/Makefile
+libgd/Makefile
 po/Makefile.in
 ])
 
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..f5cc816
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit f5cc816c2de4bf1f077b0e0b03c68b81a9f35fca
diff --git a/src/Makefile.am b/src/Makefile.am
index 279f5b5..59ce156 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,9 +16,11 @@ bin_PROGRAMS = baobab
 BUILT_SOURCES = baobab-resources.c
 
 baobab_VALAFLAGS = \
+	--vapidir=$(top_srcdir)/libgd	\
 	--pkg gtk+-3.0		\
 	--pkg gio-2.0		\
-	--pkg gio-unix-2.0
+	--pkg gio-unix-2.0	\
+	--pkg gd-1.0
 
 noinst_HEADERS = \
 	baobab-chart.h			\
@@ -54,16 +56,18 @@ baobab-resources.c: baobab.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --gen
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source baobab.gresource.xml
 
 AM_CFLAGS = \
-	$(gtk_CFLAGS)			\
+	$(BAOBAB_CFLAGS)		\
+	-I$(top_srcdir)/libgd		\
 	-Wall				\
 	-Wno-unused-but-set-variable	\
 	-Wno-unused-variable		\
 	$(NULL)
 
-baobab_LDFLAGS = -export-dynamic
+baobab_LDFLAGS = -export-dynamic -rpath $(libdir)
 baobab_LDADD = \
 	-lm				\
-	$(gtk_LIBS)			\
+	$(BAOBAB_LIBS)			\
+	$(top_builddir)/libgd/libgd.la \
 	$(NULL)
 
 MAINTAINERCLEANFILES =	\