X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=35e34e935fda261f962c53515afb9472143afc8a;hb=0526caefb3e35fe432e40fb9503d370907c9ef28;hp=3ca8401de0cfa9131e3180dd6cdff761f4b47372;hpb=5b0c51f82cf2a0c9e53e55399c4b1c8ca03a16ef;p=evince.git diff --git a/configure.ac b/configure.ac index 3ca8401d..35e34e93 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([ev_major_version],[2]) m4_define([ev_minor_version],[29]) -m4_define([ev_micro_version],[1]) +m4_define([ev_micro_version],[5]) m4_define([ev_extra_version],[]) m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) @@ -89,7 +89,8 @@ AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE]) AC_MSG_CHECKING([for which platform to build]) AC_ARG_WITH([platform], - [AS_HELP_STRING([--with-platform=gnome|win32|hildon (default: gnome)])], + [AS_HELP_STRING([--with-platform=gnome|win32|hildon], + [Setting platform (default: gnome)])], [case "$withval" in gnome|win32|hildon) ;; *) AC_MSG_ERROR([invalid argument "$withval" for --with-platform]) ;; @@ -149,8 +150,21 @@ case "$with_platform" in hildon) AC_DEFINE([PLATFORM_HILDON],[1],[Define if building for the hildon platform]) SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso" ;; - *) SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" - ;; + gnome) + # Evince has a rather soft run-time dependency on hicolor-icon-theme. + # If the hicolor theme is not available, Evince fails to display some + # icons. Because we cannot check for it at run-time, we instead + # would like to require the icon theme at compile-time. But, because + # the hicolor-icon-theme does not have a pkgconfig file, on gnome we + # require the gnome icon theme instead. + SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" + ;; + *) + # On all other platforms we issue a warning about the runtime + # dependency. + AC_MSG_WARN([Evince has a soft run-time dependency on hicolor-icon-theme. You are advised to have this theme installed when running Evince.]); + SHELL_PLATFORM_PKGS="" + ;; esac PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) @@ -161,24 +175,30 @@ PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_ GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" -SMCLIENT_PKGS= AC_MSG_CHECKING([which smclient backend to use]) AC_ARG_WITH([smclient], - [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])], + [AS_HELP_STRING([--with-smclient-backend=no|xsmp|win32|quartz], + [Setting smclient backend (default:auto)])], [], [case "$GDK_TARGET" in x11) case "$with_platform" in - gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;; + gnome) with_smclient=xsmp ;; *) with_smclient=no ;; esac ;; win32|quartz) with_smclient=$GDK_TARGET ;; *) with_smclient=no ;; esac]) + AC_MSG_RESULT([$with_smclient]) if test "$with_smclient" != "no"; then AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled]) + case "$with_smclient" in + xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;; + *) SMCLIENT_PKGS="" ;; + esac + PKG_CHECK_MODULES([SMCLIENT],[gtk+-2.0 gthread-2.0 $SMCLIENT_PKGS]) AC_SUBST([SMCLIENT_CFLAGS]) AC_SUBST([SMCLIENT_LIBS]) @@ -207,11 +227,13 @@ LIBS=$evince_save_LIBS AC_MSG_CHECKING([whether gtk+-unix-print support is requested]) AC_ARG_WITH([gtk-unix-print], - [AS_HELP_STRING([--without-gtk-unix-print],[disable the use of gtk-unix-print])], + [AS_HELP_STRING([--without-gtk-unix-print], + [Disable the use of gtk-unix-print])], [],[case "$os_win32" in yes) with_gtk_unix_print=no ;; *) with_gtk_unix_print=yes ;; esac]) + AC_MSG_RESULT([$with_gtk_unix_print]) if test "$with_gtk_unix_print" = "yes"; then @@ -224,7 +246,8 @@ fi # ********************* AC_ARG_WITH(keyring, - [AS_HELP_STRING([--without-keyring],[disable the use of gnome-keyring])], + [AS_HELP_STRING([--without-keyring], + [Disable the use of gnome-keyring])], [], [case "$with_platform" in gnome) with_keyring=yes ;; @@ -246,7 +269,7 @@ AC_SUBST(GLIB_GENMARSHAL) # **** AC_ARG_ENABLE([dbus], - [AS_HELP_STRING([--enable-dbus], [Compile with support for dbus])], + [AS_HELP_STRING([--disable-dbus], [Disable support for dbus])], [], [case "$with_platform" in gnome) enable_dbus=yes ;; @@ -278,7 +301,8 @@ dnl ========= Check for GConf AC_MSG_CHECKING([whether GConf support is requested]) AC_ARG_WITH([gconf], - [AS_HELP_STRING([--without-gconf],[disable the use of gconf])], + [AS_HELP_STRING([--without-gconf], + [Disable the use of gconf])], [], [case "$os_win32" in yes) with_gconf=no ;; @@ -305,18 +329,19 @@ fi dnl Debug mode AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [Turn on evince debug mode]),, - [enable_debug=no]) - + AS_HELP_STRING([--enable-debug], + [Turn on evince debug mode]), + [enable_debug=$enableval], + [enable_debug=no]) + if test "x$enable_debug" = "xyes"; then DEBUG_FLAGS="-DEV_ENABLE_DEBUG" fi AC_ARG_ENABLE([tests], - AC_HELP_STRING([--enable-tests], [Disable tests]), - enable_tests="$enableval", - enable_tests=yes) + AS_HELP_STRING([--enable-tests], [Enable the tests]), + [enable_tests=$enableval], + [enable_tests=yes]) AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes) @@ -325,8 +350,8 @@ LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS" AC_SUBST(LIBDOCUMENT_CFLAGS) AC_SUBST(LIBDOCUMENT_LIBS) -LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $DEBUG_FLAGS" -LIBVIEW_LIBS="$LIBVIEW_LIBS" +LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $GTKUNIXPRINT_CFLAGS $DEBUG_FLAGS" +LIBVIEW_LIBS="$LIBVIEW_LIBS $GTKUNIXPRINT_LIBS" AC_SUBST(LIBVIEW_CFLAGS) AC_SUBST(LIBVIEW_LIBS) @@ -334,8 +359,8 @@ BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG AC_SUBST(BACKEND_CFLAGS) AC_SUBST(BACKEND_LIBS) -SHELL_CFLAGS="$SHELL_CORE_CFLAGS $GTKUNIXPRINT_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" -SHELL_LIBS="$SHELL_CORE_LIBS $GTKUNIXPRINT_CFLAGS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz" +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" +SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz" AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) @@ -350,7 +375,8 @@ AC_SUBST([EV_DAEMON_LIBS]) # Check for Nautilus property page build AC_ARG_ENABLE([nautilus], - [AS_HELP_STRING([--disable-nautilus],[Build the nautilus extensions])], + [AS_HELP_STRING([--disable-nautilus], + [Disable build of nautilus extensions])], [], [case "$with_platform" in gnome) enable_nautilus=yes ;; @@ -373,7 +399,8 @@ AM_CONDITIONAL([ENABLE_NAUTILUS],[test "$enable_nautilus" = "yes"]) # Check for thumbnailer build AC_ARG_ENABLE([thumbnailer], - [AS_HELP_STRING([--disable-thumbnailer],[disable the GNOME thumbnailer])], + [AS_HELP_STRING([--disable-thumbnailer], + [Disable GNOME thumbnailer])], [], [case "$with_platform" in gnome) enable_thumbnailer=yes ;; @@ -387,7 +414,8 @@ AM_CONDITIONAL([ENABLE_THUMBNAILER],[test "$enable_thumbnailer" = "yes"]) # *************** AC_ARG_ENABLE([previewer], - [AS_HELP_STRING([--disable-previewer],[disable the GNOME Document Previewer])], + [AS_HELP_STRING([--disable-previewer], + [Disable the GNOME Document Previewer])], [], [case "$with_platform" in gnome) enable_previewer=yes ;; @@ -410,8 +438,10 @@ AC_SUBST(PREVIEWER_LIBS) AC_MSG_CHECKING([whether GObject introspection is requested]) AC_ARG_ENABLE([introspection], - AS_HELP_STRING([--enable-introspection],[Enable GObject introspection]), - [],[enable_introspection=no]) + AS_HELP_STRING([--enable-introspection], + [Enable GObject introspection]), + [enable_introspection=$enableval], + [enable_introspection=no]) AC_MSG_RESULT([$enable_introspection]) G_IR_SCANNER= @@ -449,8 +479,11 @@ AC_CHECK_DECL([_NL_MEASUREMENT_MEASUREMENT],[ ],[],[#include ]) dnl ================== pdf checks =================================================== -AC_ARG_ENABLE(pdf, - [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes) +AC_ARG_ENABLE([pdf], + [AS_HELP_STRING([--disable-pdf], + [Disable the PDF support])], + [enable_pdf=$enableval], + [enable_pdf=yes]) if test "x$enable_pdf" = "xyes"; then POPPLER_REQUIRED=0.12.0 @@ -465,6 +498,7 @@ if test "x$enable_pdf" = "xyes"; then LIBS="$LIBS $POPPLER_LIBS" AC_CHECK_FUNCS(poppler_page_render) AC_CHECK_FUNCS(poppler_page_get_image) + AC_CHECK_FUNCS(poppler_annot_file_attachment_get_attachment) LIBS=$evince_save_LIBS PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no) @@ -477,7 +511,7 @@ if test "x$enable_pdf" = "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") + AC_MSG_ERROR("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found") fi fi @@ -494,7 +528,10 @@ fi dnl ================== ps checks ==================================================== AC_ARG_ENABLE(ps, - [AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes") + [AS_HELP_STRING([--disable-ps], + [Disable the PostScript backend])], + [enable_ps=$enableval], + [enable_ps=yes]) if test "x$enable_ps" = "xyes"; then if test "x$have_spectre" = "xyes"; then @@ -509,7 +546,10 @@ dnl ======================== End of ps checks ================================== dnl ================== tiff checks =================================================== AC_ARG_ENABLE(tiff, - [AC_HELP_STRING([--enable-tiff], [Compile with support of multipage tiff])],enable_tiff="$enableval",enable_tiff=yes) + [AS_HELP_STRING([--disable-tiff], + [Disable the support of multipage tiff])], + [enable_tiff=$enableval], + [enable_tiff=yes]) if test "x$enable_tiff" = "xyes"; then AC_CHECK_HEADERS([tiff.h],enable_tiff=yes,enable_tiff=no,) @@ -530,7 +570,10 @@ 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=yes) + [AS_HELP_STRING([--disable-djvu], + [Disable the support of djvu viewer])], + [enable_djvu=$enableval], + [enable_djvu=yes]) if test "x$enable_djvu" = "xyes"; then DJVULIBRE_REQUIRED=3.5.17 @@ -554,10 +597,16 @@ 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=yes) + [AS_HELP_STRING([--disable-dvi], + [Disable the 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) + [AS_HELP_STRING([--enable-t1lib], + [Compile with support of t1lib for type1 fonts in dvi])], + [enable_type1_fonts=$enableval], + [enable_type1_fonts=no]) if test "x$enable_dvi" = "xyes"; then AC_C_CONST @@ -595,10 +644,15 @@ dnl ================== End of dvi checks ======================================= dnl ================== pixbuf checks =================================================== AC_ARG_ENABLE(pixbuf, - [AC_HELP_STRING([--enable-pixbuf], [Compile with support of pixbuf])],enable_pixbuf="$enableval",enable_pixbuf=no) + [AS_HELP_STRING([--enable-pixbuf], + [Compile with support of pixbuf])], + [enable_pixbuf=$enableval], + [enable_pixbuf=no]) + if test "x$enable_pixbuf" = "xyes"; then AC_DEFINE([ENABLE_PIXBUF], [1], [Enable pixbuf support.]) fi + AM_CONDITIONAL(ENABLE_PIXBUF, test x$enable_pixbuf = xyes) dnl ================== End of pixbuf checks =================================================== @@ -606,18 +660,14 @@ 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=yes) + [AS_HELP_STRING([--enable-comics], + [Compile with support for comic book archives])], + [enable_comics=$enableval], + [enable_comics=yes]) + if test "x$enable_comics" = "xyes"; then - if test "x$os_win32" = "xyes"; then - # The comics backend is disabled on windows because: - # 1) it uses unix functions from sys/wait.h. - # 2) it uses external decompression tools not generally available on windows. - enable_comics=no - AC_MSG_WARN(The comics backend is not supported on windows.) - else - AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) - fi -fi + AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) +fi AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes) dnl ================== End of comic book checks ============================================ @@ -625,7 +675,11 @@ dnl ================== End of comic book checks ================================ dnl ================== impress book checks =================================================== AC_ARG_ENABLE(impress, - [AC_HELP_STRING([--enable-impress], [Compile with support for impress presentations])],enable_impress="$enableval",enable_impress=no) + [AS_HELP_STRING([--enable-impress], + [Compile with support for impress presentations])], + [enable_impress=$enableval], + [enable_impress=no]) + if test "x$enable_impress" = "xyes"; then AC_DEFINE([ENABLE_IMPRESS], [1], [Enable support for impress.]) fi @@ -651,7 +705,7 @@ if test "x$enable_tiff" = "xyes"; then 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;application/x-cb7;" + EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;" fi if test "x$enable_pixbuf" = "xyes"; then EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;" @@ -708,19 +762,25 @@ data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/actions/Makefile +data/icons/16x16/mimetypes/Makefile data/icons/22x22/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/actions/Makefile +data/icons/22x22/mimetypes/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile +data/icons/24x24/mimetypes/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile +data/icons/32x32/mimetypes/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile +data/icons/scalable/actions/Makefile +data/icons/scalable/mimetypes/Makefile help/Makefile help/reference/Makefile help/reference/libdocument/Makefile