X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=configure.ac;h=e670809097efc96f62e5c7bd087f1de765cac811;hb=194a13e3f28e0578796101163ddd1ee34b1a16e0;hp=63187787ea3b8ecbe9ff556049f82b1dc3e293be;hpb=f91763ca68146b026095915fc0ee380ac23ab9ab;p=evince.git diff --git a/configure.ac b/configure.ac index 63187787..e6708090 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AC_PROG_CC AM_PROG_CC_STDC AC_PROG_CXX AC_STDC_HEADERS -AC_PROG_INTLTOOL +IT_PROG_INTLTOOL([0.34.90]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) @@ -26,8 +26,6 @@ GNOME_COMPILE_WARNINGS GNOME_CXX_WARNINGS GNOME_DEBUG_CHECK -ALL_LINGUAS="be bg bn br ca cs cy da de dz el en_CA en_GB es et eu fa fi fr gl gu he hi hu id it ja ka ko ku lt lv mk nb ne nl no pa pl pt pt_BR ro ru rw sk sq sr sr@Latn sv th tr uk vi wa zh_CN zh_HK zh_TW" - AM_GLIB_GNU_GETTEXT GETTEXT_PACKAGE=AC_PACKAGE_NAME @@ -220,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 >= $DJVULIBRE_REQUIRED, 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