summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2008-03-10 22:25:26 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-03-10 22:25:26 +0000
commit5b77b02a8d42f1544a9f5ccf2ed7494ca7858a04 (patch)
tree4cef926fe50c8beb7c8de2140065995a3b62afc7
parentf4f73ca8d38670f95182e0a15f5d826ae5e325b9 (diff)
downloadgobject-introspection-5b77b02a8d42f1544a9f5ccf2ed7494ca7858a04.tar.gz
Require automake 1.10 Add GCOV_LIBS to GILIBS
2008-03-10 Johan Dahlin <johan@gnome.org> * autogen.sh: Require automake 1.10 * configure.ac: Add GCOV_LIBS to GILIBS svn path=/trunk/; revision=142
-rw-r--r--ChangeLog7
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6385bfc8..61eda7fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-03-10 Johan Dahlin <johan@gnome.org>
+ * autogen.sh:
+ Require automake 1.10
+ * configure.ac:
+ Add GCOV_LIBS to GILIBS
+
+2008-03-10 Johan Dahlin <johan@gnome.org>
+
* tests/parser/Foo-expected.gidl:
* tests/parser/foo.c:
Rename null-ok to direction=out
diff --git a/autogen.sh b/autogen.sh
index e20803b4..cdf6b697 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="gobject-introspection"
REQUIRED_AUTOCONF_VERSION=2.53
-REQUIRED_AUTOMAKE_VERSION=1.7.2
+REQUIRED_AUTOMAKE_VERSION=1.10.1
(test -f $srcdir/configure.ac \
&& test -f $srcdir/autogen.sh) || {
diff --git a/configure.ac b/configure.ac
index a901c0b2..00cbc3c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0])
# if we ever remove manual check for ffi and require .pc file, then
# just put libffi in the PKG_CHECK_MODULES(GIREPO) deps
-GIREPO_LIBS="$GIREPO_LIBS $FFI_LIBS"
+GIREPO_LIBS="$GIREPO_LIBS $GCOV_LIBS $FFI_LIBS"
GIREPO_CFLAGS="$GIREPO_CFLAGS $FFI_CFLAGS"
GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS"