X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=cfd8d66cdefd83023395ac5523c0c6ba96921f06;hb=d8d91ca54794481bb332419e7ed193b33241d56c;hp=90055610c8d730c4d0251881728ea32956748d60;hpb=3c6bf3c002b94c6450e82b24f0c8e3fcbb53719b;p=evince.git

diff --git a/configure.ac b/configure.ac
index 90055610..cfd8d66c 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.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
+AC_INIT([Evince],[0.7.0],[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)
@@ -40,21 +40,24 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.5.2
 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
+LIBXML_REQUIRED=2.5.0
 
 GTK_PRINT_REQUIRED=2.10.0
 
-PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libxml-2.0 >= $LIBXML_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 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED gnome-keyring-1 >= $KEYRING_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)
+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 gnome-keyring-1 >= $KEYRING_REQUIRED)
+
+BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
+AC_SUBST(BACKEND_CFLAGS)
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
@@ -131,7 +134,7 @@ if test "x$enable_dbus" = "xyes" ; then
 	AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
 fi
 
-SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS"
+SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
 SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"
 AC_SUBST(SHELL_CFLAGS)
 AC_SUBST(SHELL_LIBS)
@@ -187,6 +190,42 @@ dnl ================== portability checks ======================================
 dnl for backtrace()
 AC_CHECK_HEADERS([execinfo.h])
 
+AC_CHECK_DECL([_NL_MEASUREMENT_MEASUREMENT],[
+  AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT],[1],[Define if _NL_MEASUREMENT_MEASUREMENT is available])
+  ],[],[#include <langinfo.h>])
+
+dnl ================== pdf checks ===================================================
+AC_ARG_ENABLE(pdf,
+              [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes)
+
+if test "x$enable_pdf" = "xyes"; then
+    POPPLER_REQUIRED=0.5.4
+    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
+
+    if test "x$enable_pdf" = "xyes"; then
+	    AC_DEFINE([ENABLE_PDF], [1], [Enable pdf support.])
+	    FRONTEND_LIBS="$FRONTEND_LIBS $POPPLER_LIBS"
+	    SHELL_LIBS="$SHELL_LIBS $POPPLER_LIBS"
+	    SHELL_CFLAGS="$SHELL_CFLAGS $POPPLER_CFLAGS"
+
+	    evince_save_LIBS=$LIBS
+	    LIBS="$LIBS $FRONTEND_LIBS"
+	    AC_CHECK_FUNCS(poppler_page_render)
+	    AC_CHECK_FUNCS(poppler_page_get_duration)
+	    LIBS=$evince_save_LIBS
+
+	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
+	    if test x$enable_cairo_pdf == xyes; then
+	            AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
+            fi
+    else
+	    AC_MSG_WARN("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found")
+    fi 
+fi
+
+AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes)
+dnl ================== end of pdf checks ============================================
+
 dnl ================== ggv checks ===================================================
 AC_ARG_ENABLE(ps,
   	[AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes")
@@ -328,7 +367,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)
@@ -337,12 +376,13 @@ 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 ====================================================
 
-EVINCE_MIME_TYPES="application/pdf"
-
+if test "x$enable_pdf" = "xyes" ; then
+	EVINCE_MIME_TYPES="application/pdf"
+fi
 if test "x$enable_ps" = "xyes" ; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/postscript;application/x-gzpostscript"
 fi
@@ -359,37 +399,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
@@ -400,6 +448,7 @@ Configure summary:
 	DBUS Support.......:  $enable_dbus
 	Nautilus Plugin....:  $HAVE_NAUTILUS
 
+	PDF Backend........:  $enable_pdf
 	PostScript Backend.:  $enable_ps
 	TIFF Backend.......:  $enable_tiff
 	DJVU Backend.......:  $enable_djvu