X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=configure.ac;h=132c636ba895323ab0c969c72cb364601d125b84;hb=f0929384891f45f8fc826062529d3e5569358bb1;hp=7c50c967f90cf40cba2adb30bb8e8f8142b7fc32;hpb=ec8b42c7daf3f2727a6d2d517922dfa699b35bbc;p=evince.git diff --git a/configure.ac b/configure.ac index 7c50c967..132c636b 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],[2.21.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince]) +AC_INIT([Evince],[2.21.91],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince]) AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip]) EV_API_VERSION=2.20 @@ -47,24 +47,43 @@ dnl Check dependencies DBUS_GLIB_REQUIRED=0.70 GTK_REQUIRED=2.10.0 +GLIB_REQUIRED=2.15.4 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 libxml-2.0 >= $LIBXML_REQUIRED gnome-vfs-2.0) +PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED gio-2.0 >= $GLIB_REQUIRED) PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_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) +PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) +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 gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0 libglade-2.0 gconf-2.0) BACKEND_LIBTOOL_FLAGS="-module -avoid-version" AC_SUBST(BACKEND_LIBTOOL_FLAGS) +dnl ===== Check special functions +evince_save_LIBS=$LIBS +LIBS="$LIBS $BACKEND_LIBS" +AC_CHECK_FUNCS(cairo_format_stride_for_width) +LIBS=$evince_save_LIBS + +AC_ARG_WITH(keyring, + AC_HELP_STRING([--without-keyring],[disable the use of gnome-keyring]), + [case "${withval}" in + yes) WITH_KEYRING=yes ;; + no) WITH_KEYRING=no ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-keyring) ;; + esac], + [WITH_KEYRING=yes]) dnl Default value +AM_CONDITIONAL(WITH_KEYRING, test x$WITH_KEYRING = "xyes") + +if test x$WITH_KEYRING = "xyes"; then + PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $KEYRING_REQUIRED) + AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled]) +fi + AC_ARG_WITH(libgnome, AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]), [case "${withval}" in @@ -84,55 +103,6 @@ fi GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -dnl ========= Print support -AC_ARG_WITH(print, - [AC_HELP_STRING([--with-print=no/gtk/gnome/auto], [Compile with print support [default=auto]])], - PRINT=$withval, - PRINT="auto") - -PKG_CHECK_MODULES(GNOME_PRINT, - libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED, - enable_gnome_print=yes, enable_gnome_print=no) -PKG_CHECK_MODULES(GTK_PRINT, - gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED, - enable_gtk_print=yes, enable_gtk_print=no) -enable_print=no -if test x$PRINT = xgnome -a x$enable_gnome_print = xyes; then - enable_print=gnome -else - if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then - enable_print=gtk - else - if test x$PRINT = xauto; then - if test x$enable_gtk_print = xyes; then - enable_print=gtk - else - if test x$enable_gnome_print = xyes; then - enable_print=gnome - fi - fi - fi - fi -fi - -if test x$enable_print = xgnome; then - AC_SUBST(GNOME_PRINT_CFLAGS) - AC_SUBST(GNOME_PRINT_LIBS) - AC_DEFINE([WITH_GNOME_PRINT],[1],[Enable GNOME Print Support.]) - AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.]) -fi - -if test x$enable_print = xgtk; then - AC_SUBST(GTK_PRINT_CFLAGS) - AC_SUBST(GTK_PRINT_LIBS) - AC_DEFINE([WITH_GTK_PRINT],[1],[Enable GTK Print Support.]) - AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.]) -fi - -AM_CONDITIONAL(WITH_GNOME_PRINT, test x$enable_print = xgnome) -AM_CONDITIONAL(WITH_GTK_PRINT, test x$enable_print = xgtk) - - dnl ========= Check for DBUS PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED], [enable_dbus=yes],[enable_dbus=no]) @@ -162,8 +132,8 @@ BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE" 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" +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $GNOMEUI_CFLAGS $KEYRING_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE" +SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $GNOMEUI_LIBS $KEYRING_LIBS -lz" AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) @@ -188,6 +158,8 @@ AC_ARG_ENABLE(nautilus, if test x$ENABLE_NAUTILUS = "xyes" ; then PKG_CHECK_MODULES(NAUTILUS, gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension, [HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no]) + NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` + AC_SUBST(NAUTILUS_EXTENSION_DIR) fi AC_SUBST(NAUTILUS_CFLAGS) @@ -243,6 +215,7 @@ if test "x$enable_pdf" = "xyes"; then LIBS="$LIBS $POPPLER_LIBS" AC_CHECK_FUNCS(poppler_page_render) AC_CHECK_FUNCS(poppler_page_render_for_printing) + AC_CHECK_FUNCS(poppler_page_get_image) LIBS=$evince_save_LIBS PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no) @@ -261,9 +234,10 @@ fi AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes) dnl ================== end of pdf checks ============================================ +SPECTRE_REQUIRED=0.2.0 dnl libspectre (used by ps and dvi backends) -PKG_CHECK_MODULES(SPECTRE, libspectre,have_spectre=yes,have_spectre=no) +PKG_CHECK_MODULES(SPECTRE, libspectre >= $SPECTRE_REQUIRED,have_spectre=yes,have_spectre=no) AM_CONDITIONAL(HAVE_SPECTRE, test x$have_spectre = xyes) if test "x$have_spectre" = "xyes"; then AC_DEFINE([HAVE_SPECTRE], [1], [Have libpectre]) @@ -285,7 +259,7 @@ if test x$enable_ps = xyes; then GS_VERSION=`gs --version | head -n 1 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` AC_MSG_RESULT(found $GS_VERSION) if test "$GS_VERSION" -lt "7"; then - AC_MSG_WARN([PS support is disabled since libspectre or Ghostscript (version >= 7) are needed]) + AC_MSG_WARN([PS support is disabled since libspectre (version >= $SPECTRE_REQUIRED) or Ghostscript (version >= 7) are needed]) enable_ps=no else AC_ARG_WITH(gs-aa-params, @@ -463,7 +437,6 @@ cut-n-paste/gedit-message-area/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile -cut-n-paste/fileformatchooser/Makefile data/evince.desktop.in data/Makefile data/icons/Makefile @@ -500,7 +473,7 @@ AC_OUTPUT echo " Configure summary: GNOME Support......: $WITH_GNOME - Print Support......: $enable_print + Keyring Support....: $WITH_KEYRING DBUS Support.......: $enable_dbus Nautilus Plugin....: $HAVE_NAUTILUS Thumbnailer........: $ENABLE_THUMBNAILER