[gnome-commander] Detect and support libgsf >= 1.14.26, fixes bgo#696227



commit 3acb8d95f4f9fe6a12c86666477cf238b6ad3886
Author: Dominique Leuenberger <dimstar opensuse org>
Date:   Wed Mar 20 22:31:15 2013 +0100

    Detect and support libgsf >= 1.14.26, fixes bgo#696227
    
    Signed-off-by: Uwe Scholz <uwescholz src gnome org>

 configure.in                   |    5 +++++
 src/tags/gnome-cmd-tags-doc.cc |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index a65317e..0427d3d 100644
--- a/configure.in
+++ b/configure.in
@@ -247,6 +247,11 @@ if test x$with_libgsf != xno; then
     PKG_CHECK_MODULES(GSF, libgsf-1 >= $LIBGSF_REQ, have_gsf=yes, have_gsf=no)
 fi
 if test "x$have_gsf" = "xyes"; then
+    PKG_CHECK_MODULES(GSF_1_14_26, libgsf-1 >= 1.14.26,
+                     AC_DEFINE(HAVE_GSF_1_14_26,1,[Define to 1 if you have libgsf >= 1.14.26]),
+                     have_gsf_1_14_26=no)
+fi
+if test "x$have_gsf" = "xyes"; then
    AC_DEFINE(HAVE_GSF, 1, [Define to 1 if you have libgsf (OLE and ODF) support])
 fi
 
diff --git a/src/tags/gnome-cmd-tags-doc.cc b/src/tags/gnome-cmd-tags-doc.cc
index 26e0780..9fa36d8 100644
--- a/src/tags/gnome-cmd-tags-doc.cc
+++ b/src/tags/gnome-cmd-tags-doc.cc
@@ -39,8 +39,9 @@
 #include "utils.h"
 #include "dict.h"
 
-#ifdef HAVE_GSF
-#include <gsf/gsf-doc-meta-data.h>
+#ifdef HAVE_GSF_1_14_26
+#include <gsf/gsf.h>
+#elif HAVE_GSF
 #include <gsf/gsf-infile.h>
 #include <gsf/gsf-infile-msole.h>
 #include <gsf/gsf-infile-zip.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]