X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=configure.ac;h=35e34e935fda261f962c53515afb9472143afc8a;hb=0526caefb3e35fe432e40fb9503d370907c9ef28;hp=6a8a694c54348eb3d7f8ffda88df7626b5b7be79;hpb=bd3cac726fa7c739a146f5ca68fc33e36d4c1132;p=evince.git diff --git a/configure.ac b/configure.ac index 6a8a694c..35e34e93 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,13 @@ # ***************************************************************************** m4_define([ev_major_version],[2]) -m4_define([ev_minor_version],[27]) -m4_define([ev_micro_version],[1]) +m4_define([ev_minor_version],[29]) +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]) # The evince API version -m4_define([ev_api_version], [2.25]) +m4_define([ev_api_version], [2.29]) # Libtool versioning. The backend and view libraries have separate versions. # Before making a release, the libtool version should be modified. @@ -21,14 +21,14 @@ m4_define([ev_api_version], [2.25]) # - If the interface is the same as the previous version, change to C:R+1:A # Libtool version of the backend library -m4_define([ev_document_lt_current],[1]) +m4_define([ev_document_lt_current],[2]) m4_define([ev_document_lt_revision],[0]) m4_define([ev_document_lt_age],[0]) m4_define([ev_document_lt_version_info],[ev_document_lt_current:ev_document_lt_revision:ev_document_lt_age]) m4_define([ev_document_lt_current_minus_age],[m4_eval(ev_document_lt_current - ev_document_lt_age)]) # Libtool version of the view library -m4_define([ev_view_lt_current],[1]) +m4_define([ev_view_lt_current],[2]) m4_define([ev_view_lt_revision],[0]) m4_define([ev_view_lt_age],[0]) m4_define([ev_view_lt_version_info],[ev_view_lt_current:ev_view_lt_revision:ev_view_lt_age]) @@ -51,6 +51,8 @@ if test -z "$enable_maintainer_mode"; then fi AM_MAINTAINER_MODE([enable]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AM_PROG_LIBTOOL AC_ISC_POSIX @@ -59,7 +61,8 @@ AM_PROG_CC_STDC AM_PROG_CC_C_O AC_PROG_CXX AC_STDC_HEADERS -IT_PROG_INTLTOOL([0.35.0]) + +AC_PROG_SED AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) @@ -71,16 +74,23 @@ GNOME_CXX_WARNINGS GTK_DOC_CHECK(1.0) +IT_PROG_INTLTOOL([0.35.0]) + GETTEXT_PACKAGE=evince AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) AM_GLIB_GNU_GETTEXT +m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below +EV_INTLTOOL_EVINCE_BACKEND_RULE='%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE]) + # Check which platform to use 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]) ;; @@ -107,12 +117,11 @@ if test "$with_platform" = "win32"; then fi AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"]) -AM_CONDITIONAL([PLATFORM_WIN32],[test "with_platform" = "win32"]) -AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) +AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"]) dnl Specify required versions of dependencies DBUS_GLIB_REQUIRED=0.70 -GTK_REQUIRED=2.12.0 +GTK_REQUIRED=2.14.0 GLIB_REQUIRED=2.18.0 KEYRING_REQUIRED=2.22.0 AC_SUBST([GLIB_REQUIRED]) @@ -134,18 +143,31 @@ PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIR PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED) PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) -PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) +PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) SHELL_PLATFORM_PKGS= 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 gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) +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]) # ********* # SM client @@ -153,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]) @@ -190,6 +218,7 @@ dnl ===== Check special functions evince_save_LIBS=$LIBS LIBS="$LIBS $BACKEND_LIBS" AC_CHECK_FUNCS(cairo_format_stride_for_width) +AC_CHECK_FUNCS(gtk_print_operation_get_n_pages_to_print) LIBS=$evince_save_LIBS # ****************** @@ -198,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 @@ -215,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 ;; @@ -237,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 ;; @@ -261,11 +293,16 @@ AC_SUBST([DBUS_LIBS]) AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"]) +if test "$enable_dbus" = "yes"; then + PKG_CHECK_MODULES([EV_DAEMON], [gthread-2.0 gio-2.0 >= $GLIB_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) +fi + 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 ;; @@ -278,34 +315,43 @@ AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"]) if test "$with_gconf" = "yes"; then PKG_CHECK_MODULES([GCONF],[gconf-2.0]) AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled]) -fi -AM_GCONF_SOURCE_2 + AM_GCONF_SOURCE_2 -AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false]) -if test "$with_gconf" = "yes" -a "$GCONFTOOL" = "false"; then - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) + AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false]) + if test "$GCONFTOOL" = "false"; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) + fi +else + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false) 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], + AS_HELP_STRING([--enable-tests], [Enable the tests]), + [enable_tests=$enableval], + [enable_tests=yes]) + +AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes) LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS" 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) @@ -313,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) @@ -323,9 +369,14 @@ FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz" AC_SUBST(FRONTEND_CFLAGS) AC_SUBST(FRONTEND_LIBS) +EV_DAEMON_CFLAGS="$EV_DAEMON_CFLAGS $DEBUG_FLAGS" +AC_SUBST([EV_DAEMON_CFLAGS]) +AC_SUBST([EV_DAEMON_LIBS]) + # Check for Nautilus property page build AC_ARG_ENABLE([nautilus], - [AS_HELP_STRING([--enable-nautilus],[compile the nautilus plugin])], + [AS_HELP_STRING([--disable-nautilus], + [Disable build of nautilus extensions])], [], [case "$with_platform" in gnome) enable_nautilus=yes ;; @@ -333,7 +384,8 @@ AC_ARG_ENABLE([nautilus], esac]) if test "$enable_nautilus" = "yes" ; then - PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension]) + PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension], + [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])]) NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR]) AC_SUBST(NAUTILUS_CFLAGS) @@ -347,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 ;; @@ -361,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 ;; @@ -384,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= @@ -423,11 +479,14 @@ 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.11.0 + POPPLER_REQUIRED=0.12.0 PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no) if test "x$enable_pdf" = "xyes"; then @@ -439,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) @@ -451,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 @@ -468,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 @@ -483,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,) @@ -504,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 @@ -528,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 @@ -569,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 =================================================== @@ -580,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 ============================================ @@ -599,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 @@ -625,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/*;" @@ -658,8 +738,6 @@ AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age]) # ***************************************************************************** -SHAVE_INIT([], [enable]) - AC_CONFIG_FILES([ backend/Makefile backend/comics/Makefile @@ -672,7 +750,7 @@ backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile -cut-n-paste/gedit-message-area/Makefile +cut-n-paste/evinfobar/Makefile cut-n-paste/gimpcellrenderertoggle/Makefile cut-n-paste/smclient/Makefile cut-n-paste/toolbar-editor/Makefile @@ -684,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 @@ -713,8 +797,6 @@ Makefile po/Makefile.in previewer/Makefile properties/Makefile -shave -shave-libtool shell/Makefile test/Makefile thumbnailer/Makefile @@ -739,6 +821,7 @@ Configure summary: Gtk-Doc Support....: $enable_gtk_doc Debug mode.........: $enable_debug GObj. Introspection: $enable_introspection + Tests..............: $enable_tests PDF Backend........: $enable_pdf PostScript Backend.: $enable_ps