Merge lp:~robert-ancell/shardbridge/no-g-thread-init into lp:shardbridge

[Robert Ancell]

Doesn't compile in Raring:

  CCLD test-shardbridge
test-shardbridge.o: In function `main':
/home/bob/bzr/shardbridge/src/test-shardbridge.c:1225: undefined reference to `g_thread_init'

If you bump the minimum glib requirement to 2.32 this problem goes away. You can support at least precise with this change.

Unmerged revisions

8. By Robert Ancell on 2013-02-04

Fix compile in Raring

=== modified file 'configure.ac'
--- configure.ac	2011-12-24 02:05:59 +0000
+++ configure.ac	2013-02-04 19:48:22 +0000
@@ -29,7 +29,7 @@
 AC_SUBST([SHARDBRIDGE_API_VERSION])
 AC_SUBST([SHARDBRIDGE_LIB_VERSION])
 
-VALA_CHECK_MODULES([SHARDBRIDGE], [glib-2.0 >= 2.30 json-glib-1.0 sqlheavy-0.1 gee-1.0])
+VALA_CHECK_MODULES([SHARDBRIDGE], [glib-2.0 >= 2.32 json-glib-1.0 sqlheavy-0.1 gee-1.0])
 AC_SUBST([SHARDBRIDGE_VALAFLAGS])
 AC_SUBST([SHARDBRIDGE_CFLAGS])
 AC_SUBST([SHARDBRIDGE_LIBS])
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-12-25 19:45:01 +0000
+++ src/Makefile.am	2013-02-04 19:48:22 +0000
@@ -30,7 +30,7 @@
 	--gir $(GIRNAME) \
 	-H shardbridge.h \
 	--library shardbridge-@SHARDBRIDGE_API_VERSION@ \
-	--target-glib 2.24
+	--target-glib 2.32
 
 libshardbridge_@SHARDBRIDGE_API_VERSION@_la_LDFLAGS = \
 	--version-info $(SHARDBRIDGE_LIB_VERSION)
@@ -51,7 +51,8 @@
 	--thread \
 	--vapidir=$(builddir) \
 	$(SHARDBRIDGE_VALAFLAGS) \
-	--pkg shardbridge-@SHARDBRIDGE_API_VERSION@
+	--pkg shardbridge-@SHARDBRIDGE_API_VERSION@ \
+	--target-glib 2.32
 
 test_shardbridge_LDFLAGS = \
 	$(builddir)/libshardbridge-@SHARDBRIDGE_API_VERSION@.la \