evolution r37150 - trunk/plugins/external-editor

[tml svn gnome org]

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

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

	Windows port by Fridrich Strba.

	* Makefile.am: Use -no-undefined and link with more libraries on
	Windows.

	* external-editor.c: Check HAVE_SYS_WAIT_H.



Modified:
   trunk/plugins/external-editor/ChangeLog
   trunk/plugins/external-editor/Makefile.am
   trunk/plugins/external-editor/external-editor.c

Modified: trunk/plugins/external-editor/Makefile.am
==============================================================================
--- trunk/plugins/external-editor/Makefile.am	(original)
+++ trunk/plugins/external-editor/Makefile.am	Wed Jan 28 17:24:15 2009
@@ -1,3 +1,11 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = \
+	$(EVOLUTION_MAIL_LIBS) \
+	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/e-util/libeutil.la \
+	$(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
@@ -25,7 +33,10 @@
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
 
-liborg_gnome_external_editor_la_LDFLAGS = -module -avoid-version
+liborg_gnome_external_editor_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_external_editor_la_LIBADD = \
+	$(NO_UNDEFINED_REQUIRED_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-external-editor.schemas.in

Modified: trunk/plugins/external-editor/external-editor.c
==============================================================================
--- trunk/plugins/external-editor/external-editor.c	(original)
+++ trunk/plugins/external-editor/external-editor.c	Wed Jan 28 17:24:15 2009
@@ -38,7 +38,9 @@
 #include <glib/gstdio.h>
 
 #include <sys/stat.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -151,7 +153,11 @@
 		return ;
 	}
 	
+#ifdef HAVE_SYS_WAIT_H
 	if (WEXITSTATUS (status) != 0) {
+#else
+	if (status) {
+#endif
 		d(printf ("\n\nsome problem here with external editor\n\n"));
 		return ;
 	} else {