[gnome-system-log] toolbar: use libgd git submodule instead of copy-pasting

[Cosimo Cecchi <cosimoc src gnome org>]

commit 7fd9e5aa8bdbcf525b334f8efff76626cac06816
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Aug 22 14:38:31 2012 +0200

    toolbar: use libgd git submodule instead of copy-pasting
    
    Use the new libgd git submodule instead of manually importing the code
    from gnome-documents.

 .gitmodules           |    3 +
 Makefile.am           |    4 +-
 autogen.sh            |    1 +
 configure.ac          |   11 ++-
 libgd                 |    1 +
 src/Makefile.am       |    4 +-
 src/gd-main-toolbar.c |  405 -------------------------------------------------
 src/gd-main-toolbar.h |   96 ------------
 src/logview-window.c  |    2 +-
 9 files changed, 21 insertions(+), 506 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 c176536..628de46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS = data help po src
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+
+SUBDIRS = data help libgd po src
 
 EXTRA_DIST = COPYING.docs
diff --git a/autogen.sh b/autogen.sh
index 354f05c..d5dbcc9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="GNOME System Log"
+ACLOCAL_FLAGS="-I libgd"
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.ac b/configure.ac
index d89331c..db12190 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,9 @@ AC_PROG_CXX
 AC_ISC_POSIX
 AC_HEADER_STDC
 
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
 ## don't rerun to this point if we abort
 AC_CACHE_SAVE
 
@@ -66,11 +69,17 @@ PKG_CHECK_MODULES(LOGVIEW,
                   glib-2.0 >= $GLIB_MIN_VERSION
                   gtk+-3.0 >= $GTK_MIN_VERSION)
 
+LIBGD_INIT([
+  main-toolbar
+  static
+])
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/icons/Makefile
 help/Makefile
+libgd/Makefile
 src/Makefile
 src/tests/Makefile
 po/Makefile.in
@@ -81,7 +90,7 @@ AC_OUTPUT
 dnl ==========================================================================
 echo "
 
-        GNOME Search Tool $VERSION
+        GNOME System Log $VERSION
         ==========================
 
         prefix:    ${prefix}
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..8d5897b
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 8d5897beae054b0ad21ab638260d7f71c5b357a6
diff --git a/src/Makefile.am b/src/Makefile.am
index 32d983b..f49b4b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DDATADIR=\""$(datadir)"\"				\
 	-DLOGVIEWINSTALLPREFIX=\""$(prefix)/\""			\
+	-I$(top_srcdir)/libgd					\
 	$(NULL)
 
 bin_PROGRAMS = gnome-system-log
@@ -25,8 +26,6 @@ BUILT_SOURCES = 		\
 	logview-resources.h
 
 gnome_system_log_SOURCES = 	\
-	gd-main-toolbar.c	\
-	gd-main-toolbar.h	\
 	logview-app.c		\
 	logview-app.h		\
 	logview-main.c		\
@@ -58,6 +57,7 @@ gnome_system_log_CFLAGS =	\
 gnome_system_log_LDADD =	\
 	$(LOGVIEW_LIBS)		\
 	$(Z_LIBS)		\
+	$(top_builddir)/libgd/libgd.la \
 	-lm
 
 EXTRA_DIST = \
diff --git a/src/logview-window.c b/src/logview-window.c
index c34cfec..24a8a9c 100644
--- a/src/logview-window.c
+++ b/src/logview-window.c
@@ -25,10 +25,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <libgd/gd-main-toolbar.h>
 
 #include "logview-window.h"
 
-#include "gd-main-toolbar.h"
 #include "logview-loglist.h"
 #include "logview-findbar.h"
 #include "logview-prefs.h"