diff options
| author | Vincent Untz <vuntz@gnome.org> | 2012-01-10 01:17:54 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-01-10 01:17:54 +0800 |
| commit | f15c6e4e8fcfce0b5d12871db6a48840dc34c38b (patch) | |
| tree | 6ed6d7f95f4cc2f446b88de5140146533f8464da | |
| parent | df77623924aaa03cba0e861ddf840de1f2b8f28a (diff) | |
| download | gsoc2013-evolution-f15c6e4e8fcfce0b5d12871db6a48840dc34c38b.tar.gz gsoc2013-evolution-f15c6e4e8fcfce0b5d12871db6a48840dc34c38b.tar.zst gsoc2013-evolution-f15c6e4e8fcfce0b5d12871db6a48840dc34c38b.zip | |
Bug #667346 - Fix build with libpst 0.6.54 and require this version
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ce88950d6d..b34ec77b24 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ m4_define([libgdata_minimum_version], [0.10]) m4_define([libsoup_minimum_version], [2.31.2]) m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) -m4_define([libpst_minimum_version], [0.6.41]) +m4_define([libpst_minimum_version], [0.6.54]) m4_define([libnotify_minimum_version], [0.5.1]) dnl Optional Packages @@ -1479,7 +1479,7 @@ AC_ARG_ENABLE([pst-import], [enable_pst="$enableval"], [enable_pst=yes]) if test "x$enable_pst" = "xyes"; then - PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no) + PKG_CHECK_MODULES(LIBPST, libpst >= libpst_minimum_version, have_pst=yes, have_pst=no) AC_SUBST(LIBPST_CFLAGS) AC_SUBST(LIBPST_LIBS) diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 5b990539d7..4305827ed1 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -2219,7 +2219,7 @@ pst_init (pst_file *pst, DEBUG_REGISTER_CLOSE (); #endif - if (pst_open (pst, filename) < 0) { + if (pst_open (pst, filename, NULL) < 0) { pst_error_msg ("Error opening PST file %s", filename); return -1; } |