X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=d8801fa77457e6a58ad9aa139541f8543316b57e;hb=6cb25ea305880261dca05fe3fbaea7d72119e880;hp=2e431cf9b2bb614b4fd020c5936a76d1caffed93;hpb=06afa8d63ed51abcfe3316ec94359b79fa4e43f9;p=evince.git diff --git a/configure.ac b/configure.ac index 2e431cf9..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.6.1],[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) @@ -26,6 +26,8 @@ GNOME_COMPILE_WARNINGS GNOME_CXX_WARNINGS GNOME_DEBUG_CHECK +GTK_DOC_CHECK(1.0) + GETTEXT_PACKAGE=evince AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) @@ -40,23 +42,38 @@ dnl Check dependencies # SHELL_CFLAGS for shell implementation. # SHELL_LIBS -DBUS_GLIB_REQUIRED=0.33 -GTK_REQUIRED=2.8.15 +DBUS_GLIB_REQUIRED=0.70 +GTK_REQUIRED=2.10.0 KEYRING_REQUIRED=0.4.0 LIBGNOMEUI_REQUIRED=2.14.0 +LIBGNOME_REQUIRED=2.14.0 LIBGNOMEPRINTUI_REQUIRED=2.6.0 GNOME_ICON_THEME_REQUIRED=2.17.1 +LIBXML_REQUIRED=2.5.0 GTK_PRINT_REQUIRED=2.10.0 -PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) +PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED) PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0) -PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED libglade-2.0) -PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) +PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0) +PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) + +AC_ARG_WITH(libgnome, + AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]), + [case "${withval}" in + yes) WITH_GNOME=yes ;; + no) WITH_GNOME=no ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-libgnome) ;; + esac], + [WITH_GNOME=yes]) dnl Default value +AM_CONDITIONAL(WITH_GNOME, test x$WITH_GNOME = "xyes") -BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE" -AC_SUBST(BACKEND_CFLAGS) +if test x$WITH_GNOME = "xyes"; then + PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED) + PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) + AC_DEFINE([WITH_GNOME],[1],[Define if GNOME support is enabled]) +fi GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) @@ -128,18 +145,25 @@ if test "x$enable_dbus" = "xyes" ; then fi AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) - - DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)/\1/'` - AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.]) fi -SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE" -SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz" +LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS" +LIB_LIBS="$LIB_LIBS $GNOME_LIBS" +AC_SUBST(LIB_CFLAGS) +AC_SUBST(LIB_LIBS) + +BACKEND_CFLAGS="$BACKEND_CFLAGS $GNOME_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE" +BACKEND_LIBS="$BACKEND_LIBS $GNOME_LIBS" +AC_SUBST(BACKEND_CFLAGS) +AC_SUBST(BACKEND_LIBS) + +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $GNOMEUI_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE" +SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $GNOMEUI_LIBS -lz" AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) -FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS" -FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz" +FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS $GNOME_CFLAGS" +FRONTEND_LIBS="$FRONTEND_CORE_LIBS $GNOME_LIBS -lz" AC_SUBST(FRONTEND_CFLAGS) AC_SUBST(FRONTEND_LIBS) @@ -168,13 +192,17 @@ if test x$HAVE_NAUTILUS = "xyes"; then fi AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "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 Check for thumbnailer build +AC_ARG_ENABLE(thumbnailer, + AC_HELP_STRING([--disable-thumbnailer],[disable the GNOME thumbnailer]), + [case "${enableval}" in + yes) ENABLE_THUMBNAILER=yes ;; + no) ENABLE_THUMBNAILER=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-thumbnailer) ;; + esac], + [ENABLE_THUMBNAILER=yes]) dnl Default value +AM_CONDITIONAL(ENABLE_THUMBNAILER, test x$ENABLE_THUMBNAILER = "xyes") dnl GConf configuration AM_GCONF_SOURCE_2 @@ -189,12 +217,16 @@ dnl ================== portability checks ====================================== dnl for backtrace() AC_CHECK_HEADERS([execinfo.h]) +AC_CHECK_DECL([_NL_MEASUREMENT_MEASUREMENT],[ + AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT],[1],[Define if _NL_MEASUREMENT_MEASUREMENT is available]) + ],[],[#include ]) + dnl ================== pdf checks =================================================== 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.4 + 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 @@ -202,10 +234,22 @@ if test "x$enable_pdf" = "xyes"; then FRONTEND_LIBS="$FRONTEND_LIBS $POPPLER_LIBS" SHELL_LIBS="$SHELL_LIBS $POPPLER_LIBS" SHELL_CFLAGS="$SHELL_CFLAGS $POPPLER_CFLAGS" + evince_save_LIBS=$LIBS LIBS="$LIBS $FRONTEND_LIBS" AC_CHECK_FUNCS(poppler_page_render) + 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) + if test x$enable_cairo_pdf == xyes; then + AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available]) + fi + + PKG_CHECK_MODULES(CAIRO_PS, cairo-ps, enable_cairo_ps=yes, enable_cairo_ps=no) + if test x$enable_cairo_ps == xyes; then + AC_DEFINE([HAVE_CAIRO_PS], [1], [defined if cairo-ps is available]) + fi else AC_MSG_WARN("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found") fi @@ -269,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.]) @@ -295,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) @@ -347,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 @@ -369,72 +411,87 @@ dnl ================== End of impress book checks ============================== dnl =================== Mime types list ==================================================== if test "x$enable_pdf" = "xyes" ; then - EVINCE_MIME_TYPES="application/pdf" + 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-gzpostscript" + 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) AC_CONFIG_FILES([ backend/Makefile -comics/Makefile +backend/comics/Makefile +backend/djvu/Makefile +backend/dvi/Makefile +backend/dvi/mdvi-lib/Makefile +backend/impress/Makefile +backend/pdf/Makefile +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 data/evince.desktop.in +data/Makefile +data/icons/Makefile data/icons/16x16/Makefile +data/icons/16x16/apps/Makefile +data/icons/16x16/actions/Makefile data/icons/22x22/Makefile +data/icons/22x22/apps/Makefile +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/Makefile +data/icons/48x48/apps/Makefile +data/icons/48x48/actions/Makefile data/icons/scalable/Makefile -data/Makefile -djvu/Makefile -dvi/Makefile -dvi/mdvi-lib/Makefile +data/icons/scalable/apps/Makefile help/Makefile -impress/Makefile -lib/Makefile +help/reference/Makefile +help/reference/version.xml +libdocument/Makefile Makefile -pdf/Makefile -pixbuf/Makefile po/Makefile.in properties/Makefile -ps/Makefile shell/Makefile test/Makefile thumbnailer/Makefile -tiff/Makefile ]) AC_OUTPUT echo " Configure summary: + GNOME Support......: $WITH_GNOME Print Support......: $enable_print DBUS Support.......: $enable_dbus Nautilus Plugin....: $HAVE_NAUTILUS + Thumbnailer........: $ENABLE_THUMBNAILER + Gtk-Doc Support....: $enable_gtk_doc PDF Backend........: $enable_pdf PostScript Backend.: $enable_ps