From: Hib Eris Date: Wed, 21 Jul 2010 16:26:01 +0000 (+0200) Subject: [build] Improved PREVIEWER check X-Git-Tag: EVINCE_2_31_6~22 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=evince.git;a=commitdiff_plain;h=7cd71166e4ff5baa7349e11437f88bb9e84bd8b8 [build] Improved PREVIEWER check - Check for PREVIEWER only once - Make gtk+-unix print optional for previewer --- diff --git a/configure.ac b/configure.ac index ddf351df..f2f49a83 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,6 @@ PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIR PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) PKG_CHECK_MODULES(BACKEND, gtk+-3.0 >= $GTK_REQUIRED) PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) -PKG_CHECK_MODULES(PREVIEWER, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) SHELL_PLATFORM_PKGS= case "$with_platform" in @@ -418,7 +417,7 @@ AC_ARG_ENABLE([previewer], esac]) if test x$enable_previewer = "xyes" ; then - PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gtk+-unix-print-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) + PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) fi AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"])