From 74255d31c63cab35d555856f7441c98dd1585a69 Mon Sep 17 00:00:00 2001 From: "Gergely POLONKAI (W00d5t0ck)" Date: Sat, 7 Sep 2013 23:01:22 +0200 Subject: [PATCH] Added libgd as a submodule, until GTK+ 3.10 comes out libgd provides some neat widgets, like a header similar to GTK+ 3.10's GtkHeaderBar, which comes in handy when generating the window headers. --- .gitmodules | 3 +++ Makefile.am | 2 +- autogen.sh | 1 + configure.ac | 6 ++++++ libgd | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 libgd 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 3d9b410..f6c5bf3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src po docs/reference/astrognome +SUBDIRS = libgd src po docs/reference/astrognome EXTRA_DIST = config.rpath m4/ChangeLog diff --git a/autogen.sh b/autogen.sh index d88fb6f..1100947 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,6 +5,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="astrognome" +ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" (test -f $srcdir/configure.ac \ && test -f $srcdir/src/astrognome.c) || { diff --git a/configure.ac b/configure.ac index 34bedfa..c859675 100644 --- a/configure.ac +++ b/configure.ac @@ -48,8 +48,14 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0]) PKG_CHECK_MODULES([SWE_GLIB], [swe-glib]) AC_CONFIG_MACRO_DIR([m4]) +LIBGD_INIT([ + header-bar + static +]) + AC_CONFIG_FILES([ Makefile + libgd/Makefile src/Makefile po/Makefile.in data/geonames/Makefile diff --git a/libgd b/libgd new file mode 160000 index 0000000..62f9b8b --- /dev/null +++ b/libgd @@ -0,0 +1 @@ +Subproject commit 62f9b8b92599b38d986bd26d5780edd400d318c9