From 91171e631e679e2d77e2930527d00b00700293b7 Mon Sep 17 00:00:00 2001
From: Suman Manjunath <msuman@src.gnome.org>
Date: Mon, 17 Mar 2008 04:24:32 +0000
Subject: Patch from Paul Bolle  <pebolle@tiscali.nl>: Fix for bug #519421
 (Also allow <libytnef/ytnef.h> header while compiling the TNEF attachment
 decoder plugin)

svn path=/trunk/; revision=35206
---
 plugins/tnef-attachments/ChangeLog     | 7 +++++++
 plugins/tnef-attachments/Makefile.am   | 3 ++-
 plugins/tnef-attachments/tnef-plugin.c | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'plugins/tnef-attachments')

diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
index 040e788d7a..27c444d633 100644
--- a/plugins/tnef-attachments/ChangeLog
+++ b/plugins/tnef-attachments/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-17  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #519421
+
+	* Makefile.am:
+	* tnef-plugin.c: Also allow <libytnef/tnef.h> header file.
+
 2008-02-07  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fix for bug #514736
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index c6fe9a1d34..3438726e59 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -2,7 +2,8 @@ INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(TNEF_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index c96088baca..483ed35afd 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -17,7 +17,11 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_YTNEF_H
 #include <ytnef.h>
+#elif defined HAVE_LIBYTNEF_YTNEF_H
+#include <libytnef/ytnef.h>
+#endif 
 
 #include <camel/camel-mime-part.h>
 #include <camel/camel-folder.h>
-- 
cgit v1.2.3