X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=d8801fa77457e6a58ad9aa139541f8543316b57e;hb=6cb25ea305880261dca05fe3fbaea7d72119e880;hp=83f1d68120e2c4f062ff9bae6dd9bc5df414c302;hpb=6eb03f602ee62c901002c973b2b42b2fb208076b;p=evince.git diff --git a/configure.ac b/configure.ac index 83f1d681..d8801fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([Evince],[0.9.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince]) +AC_INIT([Evince],[2.20.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince]) AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip]) AM_CONFIG_HEADER(config.h) @@ -43,7 +43,7 @@ dnl Check dependencies # SHELL_LIBS DBUS_GLIB_REQUIRED=0.70 -GTK_REQUIRED=2.8.15 +GTK_REQUIRED=2.10.0 KEYRING_REQUIRED=0.4.0 LIBGNOMEUI_REQUIRED=2.14.0 @@ -204,15 +204,6 @@ AC_ARG_ENABLE(thumbnailer, [ENABLE_THUMBNAILER=yes]) dnl Default value AM_CONDITIONAL(ENABLE_THUMBNAILER, test x$ENABLE_THUMBNAILER = "xyes") - -dnl Check for GtkRecent -PKG_CHECK_MODULES(GTK_RECENT, gtk+-2.0 >= 2.10.0, - [HAVE_GTK_RECENT=yes], [HAVE_GTK_RECENT=no]) -if test x$HAVE_GTK_RECENT = xyes; then - AC_DEFINE([HAVE_GTK_RECENT], [1], [defined if GtkRecent is available]) -fi -AM_CONDITIONAL(HAVE_GTK_RECENT, test x$HAVE_GTK_RECENT = "xyes") - dnl GConf configuration AM_GCONF_SOURCE_2 @@ -235,7 +226,7 @@ AC_ARG_ENABLE(pdf, [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes) if test "x$enable_pdf" = "xyes"; then - POPPLER_REQUIRED=0.5.9 + POPPLER_REQUIRED=0.6 PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no) if test "x$enable_pdf" = "xyes"; then @@ -247,11 +238,7 @@ if test "x$enable_pdf" = "xyes"; then evince_save_LIBS=$LIBS LIBS="$LIBS $FRONTEND_LIBS" AC_CHECK_FUNCS(poppler_page_render) - dnl we need latest poppler cvs head, - dnl this function was the last to be added - AC_CHECK_FUNCS(poppler_form_field_button_get_button_type) - AC_CHECK_FUNCS(poppler_form_field_text_get_max_len) - AC_CHECK_FUNCS(poppler_form_field_text_is_password) + AC_CHECK_FUNCS(poppler_page_render_for_printing) LIBS=$evince_save_LIBS PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no) @@ -326,13 +313,11 @@ dnl ================== end of tiff checks ====================================== dnl ================== djvu checks =================================================== AC_ARG_ENABLE(djvu, - [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=no) + [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=yes) if test "x$enable_djvu" = "xyes"; then - -DJVULIBRE_REQUIRED=3.5.17 - -PKG_CHECK_MODULES(DJVU, ddjvuapi >= $DJVULIBRE_REQUIRED, enable_djvu=yes, enable_djvu=no) + 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.]) @@ -352,7 +337,7 @@ dnl ================== End of djvu checks ====================================== dnl ================== dvi checks =================================================== AC_ARG_ENABLE(dvi, - [AC_HELP_STRING([--enable-dvi], [Compile with support of dvi viewer])],enable_dvi="$enableval",enable_dvi=no) + [AC_HELP_STRING([--enable-dvi], [Compile with support of dvi viewer])],enable_dvi="$enableval",enable_dvi=yes) AC_ARG_ENABLE(t1lib, [AC_HELP_STRING([--enable-t1lib], [Compile with support of t1lib for type1 fonts in dvi])],enable_type1_fonts="$enableval",enable_type1_fonts=no) @@ -404,7 +389,7 @@ dnl ================== End of pixbuf checks ==================================== dnl ================== comic book checks =================================================== AC_ARG_ENABLE(comics, - [AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics="$enableval",enable_comics=no) + [AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics="$enableval",enable_comics=yes) if test "x$enable_comics" = "xyes"; then AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) fi @@ -426,28 +411,28 @@ dnl ================== End of impress book checks ============================== dnl =================== Mime types list ==================================================== if test "x$enable_pdf" = "xyes" ; then - EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf" + EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;" fi if test "x$enable_ps" = "xyes" ; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;" fi if test "x$enable_dvi" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-dvi" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-dvi;" fi if test "x$enable_djvu" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/vnd.djvu" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/vnd.djvu;" fi if test "x$enable_tiff" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/tiff" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/tiff;" fi if test "x$enable_comics" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;" fi if test "x$enable_pixbuf" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;" fi if test "x$enable_impress" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation;" fi AC_SUBST(EVINCE_MIME_TYPES) @@ -463,7 +448,6 @@ backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile -cut-n-paste/recent-files/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile @@ -479,8 +463,11 @@ data/icons/22x22/actions/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile +data/icons/32x32/Makefile +data/icons/32x32/actions/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile +data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile help/Makefile