diff options
| author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-04-29 10:38:22 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-04-29 10:38:22 (GMT) |
| commit | b20dd164ff2a12342bcfbaffbe3fec41e05fa001 (patch) | |
| tree | 4340d42009fac1ba8c56cde071d5ddcd52fbcdb8 /djvu | |
| parent | 3548d5d1fd0770846c7966269fdcfd28d3947da1 (diff) | |
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.
Diffstat (limited to 'djvu')
| -rw-r--r-- | djvu/Makefile.am | 5 | ||||
| -rw-r--r-- | djvu/djvu-text.h | 5 |
2 files changed, 4 insertions, 6 deletions
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; |