X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=5f6233580dc0b613f065ece1fdaa7121689cf486;hb=0ce9b3563b591c5fe980bcf47108a3f1b6dc6a85;hp=84432ff1768193e836ca4efffa49741ed12290fa;hpb=69e3f49b323a5d14c3f85f46260924826a861fb1;p=evince.git

diff --git a/configure.ac b/configure.ac
index 84432ff1..5f623358 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 m4_define([ev_major_version],[2])
 m4_define([ev_minor_version],[29])
-m4_define([ev_micro_version],[4])
+m4_define([ev_micro_version],[5])
 m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
@@ -41,7 +41,7 @@ m4_define([ev_binary_version],[ev_document_lt_current])
 
 AC_PREREQ([2.57])
 AC_INIT([Evince],[ev_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -66,14 +66,11 @@ AC_PROG_SED
 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
 
-GTK_DOC_CHECK(1.0)
-
 IT_PROG_INTLTOOL([0.35.0])
 
 GETTEXT_PACKAGE=evince
@@ -261,9 +258,6 @@ if test "$with_keyring" = "yes"; then
         AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
 fi
 
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
-AC_SUBST(GLIB_GENMARSHAL)
-
 # ****
 # DBUS
 # ****
@@ -490,10 +484,6 @@ if test "x$enable_pdf" = "xyes"; then
     PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
-	    AC_DEFINE([ENABLE_PDF], [1], [Enable pdf support.])
-	    SHELL_LIBS="$SHELL_LIBS $POPPLER_LIBS"
-	    SHELL_CFLAGS="$SHELL_CFLAGS $POPPLER_CFLAGS"
-
 	    evince_save_LIBS=$LIBS
 	    LIBS="$LIBS $POPPLER_LIBS"
 	    AC_CHECK_FUNCS(poppler_page_render)
@@ -666,16 +656,8 @@ AC_ARG_ENABLE(comics,
 	[enable_comics=yes])
 	
 if test "x$enable_comics" = "xyes"; then
-	if test "x$os_win32" = "xyes"; then
-		# The comics backend is disabled on windows because:
-		# 1) it uses unix functions from sys/wait.h.
-		# 2) it uses external decompression tools not generally available on windows.
-		enable_comics=no
-		AC_MSG_WARN(The comics backend is not supported on windows.)
-	else
-		AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
-	fi
-fi 
+	AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
+fi
 AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
 
 dnl ================== End of comic book checks ============================================
@@ -725,12 +707,25 @@ AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
 
+# *****************
+# API documentation
+# *****************
+
+GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
+
+AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)])
+AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-2.0)])
+
+# ******************
 # Backends directory
+# ******************
 
 AC_SUBST([backenddir],"\$(libdir)/evince/ev_binary_version/backends")
 AC_SUBST([backend_binary_version],"ev_binary_version")
 
+# **********
 # Versioning
+# **********
 
 AC_SUBST([EV_MAJOR_VERSION],[ev_major_version])
 AC_SUBST([EV_MINOR_VERSION],[ev_minor_version])
@@ -744,6 +739,7 @@ AC_SUBST([EV_DOCUMENT_LT_CURRENT_MINUS_AGE],[ev_document_lt_current_minus_age])
 AC_SUBST([EV_VIEW_LT_VERSION_INFO],[ev_view_lt_version_info])
 AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age])
 
+# *****************************************************************************
 # *****************************************************************************
 
 AC_CONFIG_FILES([