Update to djvulibre-3.5.17, now it uses pkg-config. Fix for the bug

	* configure.ac:
	* djvu/Makefile.am:
	* djvu/djvu-text.h:

	Update to djvulibre-3.5.17, now it uses pkg-config. Fix
	for the bug 339868.

diff --git a/ChangeLog b/ChangeLog
index fd05759f264744503f2f472841ed2f91dc479df5..51ca9ad0349bc4d999d1edc8e63da11e26037e79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-29  Nickolay V. Shmyrev  <<nshmyrev@yandex.ru>>
+
+       * configure.ac:
+       * djvu/Makefile.am:
+       * djvu/djvu-text.h:
+       
+       Update to djvulibre-3.5.17, now it uses pkg-config. Fix
+       for the bug 339868.
+
 2006-04-22  Kjartan Maraas  <kmaraas@gnome.org>
 
        * configure.ac: Fix the LINGUAS stuff here too so it builds.

diff --git a/configure.ac b/configure.ac
index b3a1a8bfd52a889dac78cf43e95b4e858df2e575..04bc517b2b2423be38e91337cc7a876cd57dac9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -218,20 +218,17 @@ AC_ARG_ENABLE(djvu,
             [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=no)
 
 if test "x$enable_djvu" = "xyes"; then
-    AC_CHECK_HEADERS([libdjvu/ddjvuapi.h],enable_djvu=yes,enable_djvu=no,)
 
-    if test "x$enable_djvu" = "xyes"; then
-       AC_CHECK_LIB([djvulibre],ddjvu_context_create,enable_djvu=yes,enable_djvu=no,"-lpthread")
-       AC_CHECK_LIB([djvulibre],ddjvu_document_get_pageinfo,enable_djvu=yes,enable_djvu=no,"-lpthread")
-       AC_CHECK_LIB([djvulibre],ddjvu_document_get_pagetext,enable_djvu=yes,enable_djvu=no,"-lpthread")
-    fi
+DJVULIBRE_REQUIRED=3.5.17
+
+PKG_CHECK_MODULES(DJVU, ddjvuapi >= 3.5.17, enable_djvu=yes, enable_djvu=no)
 
     if test "x$enable_djvu" = "xyes"; then
         AC_DEFINE([ENABLE_DJVU], [1], [Enable djvu viewer support.])
     else
        AC_MSG_WARN([   
 ** Djvu support is disabled since a recent version of the djvulibre 
-** library was not found. You need at least djvulibre-3.5.16 which 
+** library was not found. You need at least djvulibre-3.5.17 which 
 ** can be found on http://djvulibre.djvuzone.org 
 ])
     fi 

diff --git a/djvu/Makefile.am b/djvu/Makefile.am
index 478943f613423c3c6dfcfa9b5407ebd5e19030cd..6fae0dae798bd9130ec3778c1189f304ca1e6ae1 100644 (file)
--- a/djvu/Makefile.am
+++ b/djvu/Makefile.am
@@ -3,7 +3,8 @@ INCLUDES = \
        -I$(top_srcdir)/backend                                 \
        -I$(top_srcdir)/lib                                     \
        -DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\"   \
-       $(LIB_CFLAGS)
+       $(LIB_CFLAGS)                                           \
+       $(DJVU_CFLAGS)
 
 noinst_LTLIBRARIES = libgtkdjvu.la
 
@@ -16,6 +17,6 @@ libgtkdjvu_la_SOURCES = \
        djvu-text-page.c \
        djvu-text-page.h
 
-libgtkdjvu_la_LIBADD = -lpthread -ldjvulibre
+libgtkdjvu_la_LIBADD = -lpthread $(DVJU_LIBS)
 
 

diff --git a/djvu/djvu-text.h b/djvu/djvu-text.h
index 1ed0d0acb10cca15b7de1b6ad89b8e7d48c0435b..0f99643a67a62de2f702ac4f0b4efeb0fc890666 100644 (file)
--- a/djvu/djvu-text.h
+++ b/djvu/djvu-text.h
@@ -23,10 +23,7 @@
 
 #include <glib.h>
 #include <libdjvu/ddjvuapi.h>
-
-typedef struct miniexp_s* miniexp_t;
-extern const miniexp_t miniexp_nil;
-extern const miniexp_t miniexp_dummy;
+#include <libdjvu/miniexp.h>
 
 typedef struct _DjvuText DjvuText;