[baobab/rework-toolbar: 1/3] Import libgd as git submodule

[Stefano Facchini <sfacchini src gnome org>]

commit fc8fff116f4a76f73413d9858daa4aece882fde5
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 ++--
 autogen.sh      |    2 ++
 configure.ac    |   14 ++++++++++++--
 libgd           |    1 +
 src/Makefile.am |   12 ++++++++----
 6 files changed, 28 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 37bcc92..da0838e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS =  src data pixmaps help po
+SUBDIRS =  libgd src data pixmaps help po
 
 EXTRA_DIST = COPYING.docs
 
diff --git a/autogen.sh b/autogen.sh
index c2224af..7c75aac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,8 @@ test -n "$srcdir" || srcdir=.
 OLDDIR=`pwd`
 cd $srcdir
 
+git submodule update --init --recursive
+
 AUTORECONF=`which autoreconf`
 if test -z $AUTORECONF; then
     echo "*** No autoreconf found, please intall it ***"
diff --git a/configure.ac b/configure.ac
index 4d96cba..b394aad 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..0ce531c
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 0ce531c94dd59d00e51bc3d5ed94af6d4d143783
diff --git a/src/Makefile.am b/src/Makefile.am
index 2fb52d5..9f72c9c 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			\
@@ -50,16 +52,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 = \