Index: /trunk/ChangeLog
===================================================================
--- /trunk/ChangeLog	(revision 6004)
+++ /trunk/ChangeLog	(revision 6005)
@@ -1,2 +1,7 @@
+2010-01-13  Mark Ellis  <mark@mpellis.org.uk>
+
+	* config.h.cmake,opensync/{common/opensync_list.c,version/opensync_version.c}: glib has
+	deprecated individual includes, replaced with glib.h and check for GRegex by version
+
 2010-01-10  Mark Ellis  <mark@mpellis.org.uk>
 
Index: /trunk/config.h.cmake
===================================================================
--- /trunk/config.h.cmake	(revision 6004)
+++ /trunk/config.h.cmake	(revision 6005)
@@ -20,5 +20,4 @@
 
 #cmakedefine HAVE_FLOCK
-#cmakedefine HAVE_GLIB_GREGEX_H
 #cmakedefine HAVE_SOLARIS
 
Index: /trunk/opensync/common/opensync_list.c
===================================================================
--- /trunk/opensync/common/opensync_list.c	(revision 6004)
+++ /trunk/opensync/common/opensync_list.c	(revision 6005)
@@ -31,5 +31,5 @@
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "opensync_list.h"
 #include "opensync_internals.h"
Index: /trunk/opensync/version/opensync_version.c
===================================================================
--- /trunk/opensync/version/opensync_version.c	(revision 6004)
+++ /trunk/opensync/version/opensync_version.c	(revision 6005)
@@ -39,5 +39,5 @@
 	/* Only newer versions of glib support regular expressions */
 	/* On Windows the glib regular expressions are required    */
-#ifndef HAVE_GLIB_GREGEX_H
+#if GLIB_MAJOR_VERSION < 3 && GLIB_MINOR_VERSION < 14
 	regex_t *preg = osync_try_malloc0(sizeof(regex_t), error);
 	if(!preg)
@@ -83,5 +83,5 @@
 	return -1;
 
-#else /* HAVE_GLIB_GREGEX_H */
+#else /* GLIB_MAJOR_VERSION < 3 && GLIB_MINOR_VERSION < 14 */
 	return g_regex_match_simple(pattern, string, 0, 0);
 #endif