X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=d355ff25fe3d7d527e141f5a0c652a3a6932b79f;hb=0ae8bfa06944037a72f1c0edb7f43c221f77de08;hp=256a871fac7dd06cede4b2cb4fcf684a20230357;hpb=70f641411b2fbab930b481ac844984819b48805d;p=evince.git

diff --git a/configure.ac b/configure.ac
index 256a871f..d355ff25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(evince, 0.5.2)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AC_INIT([Evince],[0.5.4],[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)
 
@@ -15,7 +15,7 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_CXX
 AC_STDC_HEADERS
-IT_PROG_INTLTOOL([0.34.90])
+IT_PROG_INTLTOOL([0.35.0])
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
@@ -41,13 +41,15 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.5.1
+POPPLER_REQUIRED=0.5.2
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.8.15
 KEYRING_REQUIRED=0.4.0
 
-LIBGNOMEUI_REQUIRED=2.6.0
-LIBGNOMEPRINTUI_REQUIRED=2.5.1
+LIBGNOMEUI_REQUIRED=2.14.0
+LIBGNOMEPRINTUI_REQUIRED=2.6.0
+
+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)
@@ -58,27 +60,54 @@ PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGN
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
 
-
-dnl ========= Check for libgnomeprintui
-AC_ARG_ENABLE(gnome-print,
-  	[AC_HELP_STRING([--disable-gnome-print], [Compile without print support])],
-	enable_gnome_print="$enableval",
-	enable_gnome_print=yes)
-
-if test x$enable_gnome_print = xyes; then
-	PKG_CHECK_MODULES(GNOME_PRINT, 
-		libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED,
-		enable_gnome_print=yes, enable_gnome_print=no)
+dnl ========= Print support
+AC_ARG_WITH(print,
+	    [AC_HELP_STRING([--with-print=no/gtk/gnome/auto], [Compile with print support [default=auto]])],
+	    PRINT=$withval,
+            PRINT="auto")
+
+PKG_CHECK_MODULES(GNOME_PRINT, 
+		  libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED,
+		  enable_gnome_print=yes, enable_gnome_print=no)
+PKG_CHECK_MODULES(GTK_PRINT,
+		  gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED,
+		  enable_gtk_print=yes, enable_gtk_print=no)
+enable_print=no
+if test x$PRINT = xgnome -a x$enable_gnome_print = xyes; then
+   enable_print=gnome
+else
+   if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then
+      enable_print=gtk
+   else
+      if test x$PRINT = xauto; then
+	 if test x$enable_gtk_print = xyes; then
+	    enable_print=gtk
+	 else
+	    if test x$enable_gnome_print = xyes; then
+	       enable_print=gnome
+	    fi
+	 fi
+      fi
+   fi
 fi
 
-AC_SUBST(GNOME_PRINT_CFLAGS)
-AC_SUBST(GNOME_PRINT_LIBS)
+if test x$enable_print = xgnome; then
+   AC_SUBST(GNOME_PRINT_CFLAGS)
+   AC_SUBST(GNOME_PRINT_LIBS)
+   AC_DEFINE([WITH_GNOME_PRINT],[1],[Enable GNOME Print Support.])
+   AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
+fi
 
-if test x$enable_gnome_print = xyes; then
- 	AC_DEFINE([WITH_GNOME_PRINT],[1],[Enable Print Support.])
-fi 
+if test x$enable_print = xgtk; then   
+   AC_SUBST(GTK_PRINT_CFLAGS)
+   AC_SUBST(GTK_PRINT_LIBS)
+   AC_DEFINE([WITH_GTK_PRINT],[1],[Enable GTK Print Support.])
+   AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
+fi
+   
+AM_CONDITIONAL(WITH_GNOME_PRINT, test x$enable_print = xgnome)
+AM_CONDITIONAL(WITH_GTK_PRINT, test x$enable_print = xgtk)
 
-AM_CONDITIONAL(WITH_GNOME_PRINT, test x$enable_gnome_print = xyes)
 
 dnl ========= Check for DBUS
 PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
@@ -292,6 +321,17 @@ AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
 
 dnl ================== End of comic book checks ============================================
 
+dnl ================== comic book checks ===================================================
+
+AC_ARG_ENABLE(impress,
+ 	[AC_HELP_STRING([--enable-impress], [Compile with support for impress presentations])],enable_impress="$enableval",enable_impress=no)
+if test "x$enable_impress" = "xyes"; then
+	AC_DEFINE([ENABLE_IMPRESS], [1], [Enable support for impress.])
+fi 
+AM_CONDITIONAL(ENABLE_IMPRESS, test x$enable_impress = xyes)
+
+dnl ================== End of comic book checks ============================================
+
 dnl =================== Mime types list ====================================================
 
 EVINCE_MIME_TYPES="application/pdf"
@@ -311,6 +351,12 @@ fi
 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/*"
+fi
+if test "x$enable_impress" = "xyes"; then
+       EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress"
+fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CONFIG_FILES([
@@ -329,6 +375,7 @@ ps/Makefile
 djvu/Makefile
 dvi/Makefile
 dvi/mdvi-lib/Makefile
+impress/Makefile
 comics/Makefile
 po/Makefile.in
 backend/Makefile
@@ -342,7 +389,7 @@ AC_OUTPUT
 
 echo "
 Configure summary:
-	Print Support......:  $enable_gnome_print
+	Print Support......:  $enable_print
 	DBUS Support.......:  $enable_dbus
 	Nautilus Plugin....:  $HAVE_NAUTILUS
 
@@ -352,4 +399,5 @@ Configure summary:
 	DVI Backend........:  $enable_dvi
 	Pixbuf Backend.....:  $enable_pixbuf
 	Comics Backend.....:  $enable_comics
+	Impress Backend....:  $enable_impress
 "