diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-12-12 14:07:06 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-12-13 14:11:36 +0100 |
| commit | ccce60da8053d624f32680fb84d49ba01df5be62 (patch) | |
| tree | 08624192a6240f3f4ad846c0cfe8b6c6b510c2bb | |
| parent | 0fa46b8a0574bb6b53f85517402ea7d99be2d816 (diff) | |
| download | totem-ccce60da8053d624f32680fb84d49ba01df5be62.tar.gz | |
build: Add libgd submodule to the build
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| m--------- | libgd | 0 |
5 files changed, 17 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..303eb9bcb --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libgd"] + path = libgd + url = ../libgd diff --git a/Makefile.am b/Makefile.am index 162671cb9..f2efdb647 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} + +NORMAL_SUBDIRS = libgd po data help src docs -NORMAL_SUBDIRS = po data help src docs SUBDIRS = $(NORMAL_SUBDIRS) if ENABLE_BROWSER_PLUGINS diff --git a/autogen.sh b/autogen.sh index f7acd2229..0f5f57b69 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,6 +5,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="totem" +ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" (test -f $srcdir/configure.ac) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" @@ -12,6 +13,9 @@ PKG_NAME="totem" exit 1 } +echo "+ Setting up submodules" +git submodule update --init --recursive + which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME SVN" exit 1 diff --git a/configure.ac b/configure.ac index 9a085de8e..2bdbf3790 100644 --- a/configure.ac +++ b/configure.ac @@ -308,6 +308,12 @@ PKG_CHECK_MODULES(THUMBNAILER, gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PL PKG_CHECK_MODULES(PREVIEW, gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0) PKG_CHECK_MODULES(PROPERTIES, gtk+-3.0 >= $GTK_REQS) +LIBGD_INIT([ + tagged-entry + static + ]) + + dnl ================================================================ dnl Vala plugins dnl ================================================================ @@ -717,6 +723,7 @@ AC_SUBST([AM_LDFLAGS]) AC_CONFIG_FILES([ Makefile totem.spec +libgd/Makefile src/Makefile src/gst/Makefile src/properties/Makefile diff --git a/libgd b/libgd new file mode 160000 +Subproject aee0c3673117e39e0da6f56f4146b7a1d6fb168 |