diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-03-17 12:24:32 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-03-17 12:24:32 +0800 |
| commit | 91171e631e679e2d77e2930527d00b00700293b7 (patch) | |
| tree | 40012d47738cf6c82ba4b92ec80739c9ee9ce198 | |
| parent | fc20edb3e4b7225db03ee469843dba50aa25dbf7 (diff) | |
| download | gsoc2013-evolution-91171e631e679e2d77e2930527d00b00700293b7.tar.gz gsoc2013-evolution-91171e631e679e2d77e2930527d00b00700293b7.tar.zst gsoc2013-evolution-91171e631e679e2d77e2930527d00b00700293b7.zip | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | plugins/tnef-attachments/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/tnef-attachments/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/tnef-attachments/tnef-plugin.c | 4 |
5 files changed, 33 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-03-17 Paul Bolle <pebolle@tiscali.nl> + + ** Fix for bug #519421 + + * configure.in: also use <libytnef/ytnef.h> to check for TNEF support + 2008-03-13 Milan Crha <mcrha@redhat.com> ** Fix for bug #512543 diff --git a/configure.in b/configure.in index 34a13ea797..2a4466c795 100644 --- a/configure.in +++ b/configure.in @@ -1388,10 +1388,22 @@ AC_TRY_COMPILE([#include <stdio.h> if test "$tnef_ok" = "yes"; then AC_MSG_RESULT([yes]) TNEF_ATTACHMENTS="tnef-attachments" + TNEF_CFLAGS="-DHAVE_YTNEF_H" else - AC_MSG_RESULT(no) - TNEF_ATTACHMENTS="" + AC_TRY_COMPILE([#include <stdio.h> + #include <libytnef/ytnef.h>], + [TNEFStruct *tnef;], tnef_ok=yes, tnef_ok=no) + if test "$tnef_ok" = "yes"; then + AC_MSG_RESULT([yes]) + TNEF_ATTACHMENTS="tnef-attachments" + TNEF_CFLAGS="-DHAVE_LIBYTNEF_YTNEF_H" + else + AC_MSG_RESULT(no) + TNEF_ATTACHMENTS="" + TNEF_CFLAGS="" + fi fi +AC_SUBST(TNEF_CFLAGS) echo "TNEF is "$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> |