diff options
| author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-05-24 15:25:31 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-05-24 15:25:31 (GMT) |
| commit | 5e33cba1571535c918759f7fe2177ab9eb5b971a (patch) | |
| tree | 6bac6d63f4193fda95ca993b06d9649b5d311acc /shell | |
| parent | 2f699999fc1a36a07c619531c7063f415156093e (diff) | |
Cleanup tiff configure checks. Fix for bug 305218.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 8 | ||||
| -rw-r--r-- | shell/ev-document-types.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 43279e5..3e1c2b7 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -30,7 +30,6 @@ libevbackendfactory_la_SOURCES= \ libevbackendfactory_la_LIBADD = \ $(top_builddir)/pdf/libpdfdocument.la \ $(top_builddir)/pixbuf/libpixbufdocument.la \ - $(top_builddir)/tiff/libtiffdocument.la \ $(top_builddir)/ps/libgtkgs.la \ $(top_builddir)/backend/libevbackend.la \ $(NULL) @@ -41,6 +40,12 @@ libevbackendfactory_la_LIBADD += \ $(NULL) endif +if ENABLE_TIFF +libevbackendfactory_la_LIBADD += \ + $(top_builddir)/tiff/libtiffdocument.la \ + $(NULL) +endif + if ENABLE_DVI libevbackendfactory_la_LIBADD += \ $(top_builddir)/dvi/libgtkdvi.la \ @@ -86,7 +91,6 @@ evince_SOURCES= \ evince_LDADD= \ $(SHELL_LIBS) \ - $(LIBTIFF) \ $(top_builddir)/cut-n-paste/recent-files/librecent.la \ $(top_builddir)/cut-n-paste/zoom-control/libephymisc.la \ $(top_builddir)/cut-n-paste/zoom-control/libephywidgets.la \ diff --git a/shell/ev-document-types.c b/shell/ev-document-types.c index b39cfd7..6ce546b 100644 --- a/shell/ev-document-types.c +++ b/shell/ev-document-types.c @@ -57,8 +57,10 @@ const EvDocumentType document_types[] = { {"application/x-gzpostscript", ps_document_get_type}, {"image/x-eps", ps_document_get_type}, +#ifdef ENABLE_TIFF /* Tiff: */ {"image/tiff", tiff_document_get_type}, +#endif #ifdef ENABLE_DJVU /* djvu: */ |