[gnome-boxes] Replace libgd with git submodule

[Marc-Andre Lureau <malureau src gnome org>]

commit 395652458d8b311a25ecb27cc42287602a122b1f
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Fri Aug 17 03:19:27 2012 +0300

    Replace libgd with git submodule

 .gitmodules                       |    3 +
 Makefile.am                       |    2 +-
 autogen.sh                        |    1 +
 configure.ac                      |   15 +-
 libgd                             |    1 +
 libgd/Makefile.am                 |   95 ----
 libgd/gd-entry-focus-hack.c       |   87 ---
 libgd/gd-entry-focus-hack.h       |   30 --
 libgd/gd-main-icon-view.c         |  203 --------
 libgd/gd-main-icon-view.h         |   74 ---
 libgd/gd-main-toolbar.c           |  405 ---------------
 libgd/gd-main-toolbar.h           |   96 ----
 libgd/gd-main-view-generic.c      |  154 ------
 libgd/gd-main-view-generic.h      |  106 ----
 libgd/gd-margin-container.c       |  379 --------------
 libgd/gd-margin-container.h       |   75 ---
 libgd/gd-tagged-entry.c           | 1037 -------------------------------------
 libgd/gd-tagged-entry.h           |   90 ----
 libgd/gd-toggle-pixbuf-renderer.c |  198 -------
 libgd/gd-toggle-pixbuf-renderer.h |   75 ---
 libgd/gd-two-lines-renderer.c     |  528 -------------------
 libgd/gd-two-lines-renderer.h     |   75 ---
 libgd/gd.h                        |   40 --
 src/Makefile.am                   |   12 +-
 24 files changed, 20 insertions(+), 3761 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..303eb9b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+	path = libgd
+	url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index 9f6942f..b36d3e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 NULL =
 
 SUBDIRS = data libgd src po vapi
diff --git a/autogen.sh b/autogen.sh
index a9d2730..0360ecd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ set -e # exit on errors
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+git submodule update --init --recursive
 autoreconf -v --force --install
 intltoolize -f
 
diff --git a/configure.ac b/configure.ac
index c097a94..82056cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,13 +102,14 @@ VALA_CHECK([0.17.2], [
 ])
 
 dnl libgd
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-PKG_CHECK_MODULES(LIBGD, [
-  glib-2.0 >= $GLIB_MIN_VERSION
-  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-  gtk+-3.0 >= $GTK_MIN_VERSION
+LIBGD_INIT([
+  gtk-hacks
+  main-toolbar
+  main-icon-view
+  margin-container
+  static
+  tagged-entry
+  vapi
 ])
 
 dnl Strict compiler
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..7ae6684
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 7ae66844d277c7cb1c90d8669104585cbc23748b
diff --git a/src/Makefile.am b/src/Makefile.am
index 8538929..5990509 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS =						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(DISABLE_DEPRECATED)				\
 	-DG_LOG_DOMAIN=\""Boxes"\"			\
-	-I$(top_srcdir)					\
+	-I$(top_srcdir)/libgd                           \
 	$(NULL)
 
 AM_VALAFLAGS =						\
@@ -22,7 +22,7 @@ AM_VALAFLAGS =						\
 	--pkg cogl-1.0					\
 	--pkg config					\
 	--pkg common					\
-	--pkg gd-1.0					\
+	--pkg gd					\
 	--pkg gdk-pixbuf-2.0				\
 	--pkg glib-2.0					\
 	--pkg gtk-vnc-2.0				\
@@ -113,10 +113,10 @@ gnome_boxes_SOURCES =				\
 	wizard.vala				\
 	$(NULL)
 
-gnome_boxes_LDADD =					\
-	$(BOXES_LIBS)					\
-	$(top_builddir)/libgd/libgdprivate-1.0.la	\
-	libcommon.a					\
+gnome_boxes_LDADD =				\
+	$(BOXES_LIBS)				\
+	$(top_builddir)/libgd/libgd.la		\
+	libcommon.a				\
 	$(NULL)
 
 gnome_boxes_CFLAGS = $(BOXES_CFLAGS)