X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=103e02cf160e452e302d95904ba37f8c781c6bc6;hb=205c689a78e992d1ad3cf9223f7c95bf424dda94;hp=541b63673fced46dd4913dac26e2e8a88ace7ede;hpb=6b8fbfe2f3acb42e9dba650fcb1172c8aa02ba16;p=evince.git

diff --git a/configure.ac b/configure.ac
index 541b6367..103e02cf 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.3.4)
+AC_INIT(evince, 0.5.0)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AM_CONFIG_HEADER(config.h)
@@ -26,7 +26,7 @@ GNOME_COMPILE_WARNINGS
 GNOME_CXX_WARNINGS
 GNOME_DEBUG_CHECK
 
-ALL_LINGUAS="bg ca cs da de el en_CA en_GB es et eu fi fr gl gu he hi hu ja ko lt nb ne nl no pa pl pt_BR ru rw sk sq sr sr@Latn sv th tr uk wa zh_CN zh_TW"
+ALL_LINGUAS="be bg bn ca cs da de el en_CA en_GB es et eu fi fr gl gu he hi hu id it ja ko ku lt nb ne nl no pa pl pt pt_BR ro ru rw sk sq sr sr@Latn sv th tr uk wa zh_CN zh_TW"
 
 AM_GLIB_GNU_GETTEXT
 
@@ -43,16 +43,17 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.4.0
+POPPLER_REQUIRED=0.4.1
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.6.0
 LIBGNOMEUI_REQUIRED=2.6.0
+KEYRING_REQUIRED=0.4.0
 
 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(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(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)
@@ -80,12 +81,12 @@ if test "x$enable_dbus" = "xyes" ; then
 fi
 
 SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS"
-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -ltiff -lz"
+SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"
 AC_SUBST(SHELL_CFLAGS)
 AC_SUBST(SHELL_LIBS)
 
 FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS"
-FRONTEND_LIBS="$FRONTEND_CORE_LIBS -ltiff -lz"
+FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz"
 AC_SUBST(FRONTEND_CFLAGS)
 AC_SUBST(FRONTEND_LIBS)
 
@@ -118,6 +119,7 @@ dnl Check for functions not present in gtk 2.6
 evince_save_LIBS=$LIBS
 LIBS="$LIBS $FRONTEND_CORE_LIBS"
 AC_CHECK_FUNCS(gtk_icon_view_get_visible_range)
+AC_CHECK_FUNCS(gtk_window_present_with_time)
 AC_CHECK_FUNCS(g_file_set_contents)
 LIBS=$evince_save_LIBS
 
@@ -129,6 +131,11 @@ if test "x$GCONFTOOL" = "xno"; then
 	AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
 fi
 
+dnl ================== portability checks ===========================================
+
+dnl for backtrace()
+AC_CHECK_HEADERS([execinfo.h])
+
 dnl ================== ggv checks ===================================================
 AC_ARG_WITH(gs-pkg,
             [  --with-gs=dir       Directory Where GhostScript package is installed.])
@@ -169,6 +176,8 @@ if test "x$enable_tiff" = "xyes"; then
     fi
     if test "x$enable_tiff" = "xyes"; then
 	    AC_DEFINE([ENABLE_TIFF], [1], [Enable multipage tiff support.])
+	    FRONTEND_LIBS="$FRONTEND_LIBS -ltiff"
+	    SHELL_LIBS="$SHELL_LIBS -ltiff"
     else
 	    AC_MSG_WARN("Tiff support is disabled since tiff library version 3.6 or newer not found")
     fi 
@@ -233,7 +242,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
@@ -255,7 +264,28 @@ if test "x$enable_pixbuf" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_PIXBUF, test x$enable_pixbuf = xyes)
 
-dnl ================== End of dvi checks ===================================================
+dnl ================== End of pixbuf checks ===================================================
+
+dnl ================== comic book checks ===================================================
+ 
+AC_ARG_ENABLE(comics,
+ 	[AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics=yes,enable_comics=no)
+if test "x$enable_comics" = "xyes"; then
+	AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
+
+fi 
+AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
+
+AC_PATH_PROG(UPDATE_MIME_DB, update-mime-database, no)
+AC_SUBST(UPDATE_MIME_DB)
+
+AC_ARG_ENABLE(update-mimedb,
+   AC_HELP_STRING([--disable-update-mimedb],
+                   [disable the update-mime-database after install [default=no]]),,
+    enable_update_mimedb=yes)
+AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+
+dnl ================== End of comic book checks ============================================
 
 dnl =================== Mime types list ====================================================
 
@@ -270,6 +300,9 @@ fi
 if test "x$enable_tiff" = "xyes"; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/tiff"
 fi
+if test "x$enable_comics" = "xyes"; then
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/cbr;application/cbz"
+fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CONFIG_FILES([
@@ -288,6 +321,7 @@ ps/Makefile
 djvu/Makefile
 dvi/Makefile
 dvi/mdvi-lib/Makefile
+comics/Makefile
 po/Makefile.in
 backend/Makefile
 properties/Makefile