[gnome-initial-setup] Add libgd as a submodule



commit 3e6942cfe2f03594562fa153da5612967e415d9c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Feb 26 17:26:54 2013 -0500

    Add libgd as a submodule

 .gitmodules                     |    3 +++
 Makefile.am                     |    4 ++--
 autogen.sh                      |    1 +
 configure.ac                    |    3 +++
 gnome-initial-setup/Makefile.am |    1 +
 libgd                           |    1 +
 6 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 992c00b..afb8a61 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "egg-list-box"]
        path = egg-list-box
        url = git://git.gnome.org/egg-list-box
+[submodule "libgd"]
+       path = libgd
+       url = git://git.gnome.org/libgd
diff --git a/Makefile.am b/Makefile.am
index 1139026..21d5b39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 AM_CFLAGS = ${WARN_CFLAGS}
 
-SUBDIRS = egg-list-box data gnome-initial-setup player po
+SUBDIRS = egg-list-box libgd data gnome-initial-setup player po
 
 EXTRA_DIST = \
     autogen.sh \
diff --git a/autogen.sh b/autogen.sh
index e0b53d5..a6a2822 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gnome-initial-setup"
+ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/gnome-initial-setup.doap) || {
diff --git a/configure.ac b/configure.ac
index 554e3cb..8d7c29a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,8 @@ PKG_CHECK_MODULES(ISOCODES, iso-codes)
 AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
 ISO_CODES=iso-codes
 
+LIBGD_INIT([stack])
+
 # systemd
 AC_ARG_WITH([systemdsystemunitdir],
         AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
@@ -148,5 +150,6 @@ gnome-initial-setup/pages/summary/Makefile
 gnome-initial-setup/pages/keyboard/Makefile
 po/Makefile.in
 player/Makefile
+libgd/Makefile
 ])
 AC_OUTPUT
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index dd5702d..bbee4d8 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -35,6 +35,7 @@ gnome_initial_setup_LDADD =   \
        pages/goa/libgisgoa.la \
        pages/summary/libgissummary.la \
        $(INITIAL_SETUP_LIBS) \
+       $(top_builddir)/libgd/libgd.la  \
        -lm
 
 gnome_initial_setup_copy_worker_SOURCES =              \
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..0d817b0
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 0d817b002d6c782cb6d0db8ca6a69312cf1293eb


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]