evolution r37148 - trunk/plugins/backup-restore

[tml svn gnome org]

Author: tml
Date: Wed Jan 28 17:19:48 2009
New Revision: 37148
URL: http://svn.gnome.org/viewvc/evolution?rev=37148&view=rev

Log:
2009-01-28  Tor Lillqvist  <tml novell com>

	Make it compile on Windows, by Fridrich Strbra. (Just compile;
	little chance of it actually doing anything sensible on Windows at
	this point...)

	* Makefile.am: Use -no-undefined on Windows. Link with libeutil.

	* backup.c: Remove unused <sys/wait.h>.

	* backup-restore.c: Check HAVE_SYS_WAIT_H.



Modified:
   trunk/plugins/backup-restore/ChangeLog
   trunk/plugins/backup-restore/Makefile.am
   trunk/plugins/backup-restore/backup-restore.c
   trunk/plugins/backup-restore/backup.c

Modified: trunk/plugins/backup-restore/Makefile.am
==============================================================================
--- trunk/plugins/backup-restore/Makefile.am	(original)
+++ trunk/plugins/backup-restore/Makefile.am	Wed Jan 28 17:19:48 2009
@@ -21,7 +21,8 @@
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
 liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_backup_restore_la_LIBADD =	\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_MAIL_LIBS) \
+	$(top_builddir)/e-util/libeutil.la
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c

Modified: trunk/plugins/backup-restore/backup-restore.c
==============================================================================
--- trunk/plugins/backup-restore/backup-restore.c	(original)
+++ trunk/plugins/backup-restore/backup-restore.c	Wed Jan 28 17:19:48 2009
@@ -18,9 +18,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -71,9 +78,13 @@
 	result = system (command);
 	g_free (command);
 
+#ifdef HAVE_SYS_WAIT_H
 	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
 
-	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
+	return WIFEXITED (result) && (WEXITSTATUS (result) == 0); */
+#else	
+	return result;
+#endif
 }
 
 static guint32

Modified: trunk/plugins/backup-restore/backup.c
==============================================================================
--- trunk/plugins/backup-restore/backup.c	(original)
+++ trunk/plugins/backup-restore/backup.c	Wed Jan 28 17:19:48 2009
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>