Merge remote branch 'pwith/fixes3-no-prepare'

diff --cc configure.ac
index 02ff146,5de6716..c7bd18f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -54,19 -64,34 +64,34 @@@ AC_SUBST(CPPFLAGS
  AC_SUBST(LDFLAGS)
  GTK_DOC_CHECK([1.10])
  
+ # -----------------------------------------------------------
+ # Dependencies
+ # -----------------------------------------------------------
  GLIB_REQUIRED=2.12.0
 -TP_GLIB_REQUIRED=0.11.4.1
 -TP_VALA_REQUIRED=0.11.4.1
 +TP_GLIB_REQUIRED=0.11.8.1
 +TP_VALA_REQUIRED=0.11.8.1
  
- PKG_CHECK_MODULES(LIBFOLKS,
+ PKG_CHECK_MODULES(GLIB,
                    glib-2.0 >= $GLIB_REQUIRED
-                   gobject-2.0 >= $GLIB_REQUIRED
-                   dbus-glib-1
-                   gee-1.0
-                   telepathy-vala >= $TP_VALA_REQUIRED
-                   )
- AC_SUBST(LIBFOLKS_CFLAGS)
- AC_SUBST(LIBFOLKS_LIBS)
+                   gobject-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
+ AC_SUBST(DBUS_GLIB_CFLAGS)
+ AC_SUBST(DBUS_GLIB_LIBS)
+ 
+ PKG_CHECK_MODULES(GEE, gee-1.0)
+ AC_SUBST(GEE_CFLAGS)
+ AC_SUBST(GEE_LIBS)
+ 
+ PKG_CHECK_MODULES(TP_VALA, telepathy-vala >= $TP_VALA_REQUIRED)
+ AC_SUBST(TP_VALA_CFLAGS)
+ AC_SUBST(TP_VALA_LIBS)
+ 
+ PKG_CHECK_MODULES(TP_GLIB, telepathy-glib >= $TP_GLIB_REQUIRED)
+ AC_SUBST(TP_GLIB_CFLAGS)
+ AC_SUBST(TP_GLIB_LIBS)
  
  # -----------------------------------------------------------
  # Documentation