X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=b280ed366bef69df1cdd416f88c9ff62a477d352;hb=764a2c143a33fd3d66e5732aec404d0f3da164cc;hp=791ac1395a98869ba8c99184dc9ffd9aea234b71;hpb=653309968aca765444c5b99c56133f07972c06d3;p=evince.git diff --git a/configure.ac b/configure.ac index 791ac139..b280ed36 100644 --- a/configure.ac +++ b/configure.ac @@ -47,12 +47,13 @@ POPPLER_REQUIRED=0.4.1 DBUS_GLIB_REQUIRED=0.33 GTK_REQUIRED=2.6.0 LIBGNOMEUI_REQUIRED=2.6.0 +KEYRING_REQUIRED=0.4.2 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED) PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 poppler-glib >= $POPPLER_REQUIRED) PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED) -PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED) +PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED gnome-keyring-1 >= $KEYRING_REQUIRED) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) @@ -239,7 +240,7 @@ AM_CONDITIONAL(ENABLE_DVI, test x$enable_dvi = xyes) if test "x$enable_dvi" = "xyes"; then if test "x$enable_type1_fonts" = "xyes"; then - AC_CHECK_LIB([t1lib],T1_InitLib,enable_type1_fonts=yes,enable_type1_fonts=no) + AC_CHECK_LIB([t1],T1_InitLib,enable_type1_fonts=yes,enable_type1_fonts=no,[-lm]) fi if test "x$enable_type1_fonts" = xyes; then