[Opensync-commits] r5094 - in plugins/evolution2: . src

[<dg...@su...>]

Author: ianmartin
Date: Sun Jan 11 05:22:39 2009
New Revision: 5094
URL: http://www.opensync.org/changeset/5094

Log:
Check for presence of libedataserver/eds-version.h as it was only added in 2.23

Modified:
   plugins/evolution2/CMakeLists.txt
   plugins/evolution2/src/evolution2_sync.c

Modified: plugins/evolution2/CMakeLists.txt
==============================================================================
--- plugins/evolution2/CMakeLists.txt	Sun Jan 11 05:21:39 2009	(r5093)
+++ plugins/evolution2/CMakeLists.txt	Sun Jan 11 05:22:39 2009	(r5094)
@@ -15,6 +15,9 @@
 INCLUDE( OpenSyncInternal )
 INCLUDE( Testing )
 
+INCLUDE( CheckIncludeFile )
+CHECK_INCLUDE_FILE( "libedataserver/eds-version.h" HAVE_EDS_VERSION_H )
+
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( tools )
 ADD_SUBDIRECTORY( tests )

Modified: plugins/evolution2/src/evolution2_sync.c
==============================================================================
--- plugins/evolution2/src/evolution2_sync.c	Sun Jan 11 05:21:39 2009	(r5093)
+++ plugins/evolution2/src/evolution2_sync.c	Sun Jan 11 05:22:39 2009	(r5094)
@@ -20,7 +20,9 @@
  */
 #include <string.h>
 
+#ifdef HAVE_EDS_VERSION_H
 #include <libedataserver/eds-version.h>
+#endif /* HAVE_EDS_VERSION_H */
 
 #include <opensync/opensync.h>
 #include <opensync/opensync-format.h>
@@ -136,8 +138,13 @@
 
 static char *evo2_determine_version()
 {
-	char *version = osync_strdup_printf("%i.%i.%i", eds_major_version, eds_minor_version, eds_micro_version);
-	return version;
+	char *version = NULL;
+#ifdef HAVE_EDS_VERSION
+	version = osync_strdup_printf("%i.%i.%i", eds_major_version, eds_minor_version, eds_micro_version);
+#else
+	version = osync_strdup("Unknown");
+#endif /* HAVE_EDS_VERSION */
+return version;
 }