From b20dd164ff2a12342bcfbaffbe3fec41e05fa001 Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Sat, 29 Apr 2006 10:38:22 +0000
Subject: 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.
---
(limited to 'djvu')

diff --git a/djvu/Makefile.am b/djvu/Makefile.am
index 478943f..6fae0da 100644
--- 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 1ed0d0a..0f99643 100644
--- 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;
 
--
cgit v0.9.1