X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=2027403816920c9546341a41751a0a0dcc43aa9c;hb=1ba681aa9eb43a60f0a01c1939e70f9f6de755c7;hp=a0459df966007391e8e8ea8e090a921b41b36361;hpb=848665b157185945d190a7a746d054d7f5d5e6e0;p=evince.git

diff --git a/configure.ac b/configure.ac
index a0459df9..20274038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,12 +20,13 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
 GNOME_COMMON_INIT
+GNOME_DOC_INIT
 GNOME_MAINTAINER_MODE_DEFINES
 GNOME_COMPILE_WARNINGS
 GNOME_CXX_WARNINGS
 GNOME_DEBUG_CHECK
 
-ALL_LINGUAS="bg ca cs da de el en_CA en_GB es eu fi fr hu ja ko lt nb nl no pt_BR ru rw sk sv th uk wa zh_CN zh_TW"
+ALL_LINGUAS="bg ca cs da de el en_CA en_GB es et eu fi fr gl gu hi hu ja ko lt nb ne nl no pa pl pt_BR ru rw sk sq sr sr@Latn sv th uk wa zh_CN zh_TW"
 
 AM_GLIB_GNU_GETTEXT
 
@@ -73,7 +74,6 @@ if test "x$enable_dbus" = "xyes" ; then
         fi                                            
 
         AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
-	AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled])
 
 	DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'`
 	AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
@@ -90,7 +90,6 @@ AC_SUBST(FRONTEND_CFLAGS)
 AC_SUBST(FRONTEND_LIBS)
 
 AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
-AM_CONDITIONAL([ENABLE_METADATA], [test "x$enable_dbus" = "xyes"])
 AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
 
 dnl Check for Nautilus property page build
@@ -115,10 +114,11 @@ if test x$HAVE_NAUTILUS = "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
 
-dnl Check for gtk_icon_view_get_visible_range
+dnl Check for functions not present in gtk 2.6
 evince_save_LIBS=$LIBS
-LIBS="$LIBS $GTK_LIBS"
+LIBS="$LIBS $FRONTEND_CORE_LIBS"
 AC_CHECK_FUNCS(gtk_icon_view_get_visible_range)
+AC_CHECK_FUNCS(g_file_set_contents)
 LIBS=$evince_save_LIBS
 
 dnl GConf configuration
@@ -194,13 +194,9 @@ if test "x$enable_djvu" = "xyes"; then
         AC_DEFINE([ENABLE_DJVU], [1], [Enable djvu viewer support.])
     else
 	AC_MSG_WARN([	
-** Djvu support is disabled since recent version of djvulibre 
-** library was not found. To get proper djvu support you need to
-** install development version of djvulibre. You can get it from
-** anonymous CVS server on djvulibre.sf.net. Just use something
-** like:
-
-** cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvsroot/djvu co djvulibre-3.5
+** Djvu support is disabled since a recent version of the djvulibre 
+** library was not found. You need at least djvulibre-3.5.15 which 
+** can be found on http://djvulibre.djvuzone.org 
 ])
     fi 
 fi
@@ -250,6 +246,17 @@ AM_CONDITIONAL(WITH_TYPE1_FONTS, test x$enable_type1_fonts = xyes)
 
 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)
+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 dvi checks ===================================================
+
 dnl =================== Mime types list ====================================================
 
 EVINCE_MIME_TYPES="application/pdf;application/postscript;application/x-gzpostscript"
@@ -265,7 +272,7 @@ if test "x$enable_tiff" = "xyes"; then
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 cut-n-paste/Makefile
 cut-n-paste/recent-files/Makefile
@@ -287,5 +294,6 @@ properties/Makefile
 shell/Makefile
 thumbnailer/Makefile
 help/Makefile
-help/C/Makefile
 ])
+
+AC_OUTPUT