X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=78b9c88986714f2982e18dfaa75a0afe8449961f;hb=e447d2da0840ee8551f4371d33a20060068965cc;hp=462891a627d182c4fc2fb6efd0211561ff541ece;hpb=63718064505c640af952c6e180b75235a1de5f14;p=evince.git

diff --git a/configure.ac b/configure.ac
index 462891a6..78b9c889 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],[0.5.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
+AC_INIT([Evince],[0.6.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
 
 AM_CONFIG_HEADER(config.h)
@@ -26,11 +26,10 @@ GNOME_COMPILE_WARNINGS
 GNOME_CXX_WARNINGS
 GNOME_DEBUG_CHECK
 
-AM_GLIB_GNU_GETTEXT
-
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
+GETTEXT_PACKAGE=evince
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+AM_GLIB_GNU_GETTEXT
 
 dnl Check dependencies
 
@@ -41,19 +40,20 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.5.2
+POPPLER_REQUIRED=0.5.4
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.8.15
 KEYRING_REQUIRED=0.4.0
 
 LIBGNOMEUI_REQUIRED=2.14.0
 LIBGNOMEPRINTUI_REQUIRED=2.6.0
+GNOME_ICON_THEME_REQUIRED=2.17.1
 
 GTK_PRINT_REQUIRED=2.10.0
 
 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
-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(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_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 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED gnome-keyring-1 >= $KEYRING_REQUIRED)
 
@@ -171,7 +171,7 @@ dnl Check for GtkRecent
 PKG_CHECK_MODULES(GTK_RECENT, gtk+-2.0 >= 2.10.0, 
 		  [HAVE_GTK_RECENT=yes], [HAVE_GTK_RECENT=no])
 if test x$HAVE_GTK_RECENT = xyes; then
-   AC_DEFINE(HAVE_GTK_RECENT, 1, [defined if GtkRecent is available])
+   AC_DEFINE([HAVE_GTK_RECENT], [1], [defined if GtkRecent is available])
 fi
 AM_CONDITIONAL(HAVE_GTK_RECENT, test x$HAVE_GTK_RECENT = "xyes")
 
@@ -329,7 +329,7 @@ AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
 
 dnl ================== End of comic book checks ============================================
 
-dnl ================== 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)
@@ -338,7 +338,7 @@ if test "x$enable_impress" = "xyes"; then
 fi 
 AM_CONDITIONAL(ENABLE_IMPRESS, test x$enable_impress = xyes)
 
-dnl ================== End of comic book checks ============================================
+dnl ================== End of impress book checks ============================================
 
 dnl =================== Mime types list ====================================================
 
@@ -360,37 +360,45 @@ if test "x$enable_comics" = "xyes"; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz"
 fi
 if test "x$enable_pixbuf" = "xyes"; then
-       EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*"
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*"
 fi
 if test "x$enable_impress" = "xyes"; then
-       EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress"
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CONFIG_FILES([
-Makefile
+backend/Makefile
+comics/Makefile
 cut-n-paste/Makefile
 cut-n-paste/recent-files/Makefile
-cut-n-paste/zoom-control/Makefile
 cut-n-paste/toolbar-editor/Makefile
-data/Makefile
+cut-n-paste/zoom-control/Makefile
+cut-n-paste/totem-screensaver/Makefile
 data/evince.desktop.in
-lib/Makefile
-pdf/Makefile
-pixbuf/Makefile
-tiff/Makefile
-ps/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/48x48/Makefile
+data/icons/Makefile
+data/icons/scalable/Makefile
+data/Makefile
 djvu/Makefile
 dvi/Makefile
 dvi/mdvi-lib/Makefile
+help/Makefile
 impress/Makefile
-comics/Makefile
+lib/Makefile
+Makefile
+pdf/Makefile
+pixbuf/Makefile
 po/Makefile.in
-backend/Makefile
 properties/Makefile
+ps/Makefile
 shell/Makefile
+test/Makefile
 thumbnailer/Makefile
-help/Makefile
+tiff/Makefile
 ])
 
 AC_OUTPUT