Reopen should reload document. Fixes bug 327951.

[evince.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7e06105372d422b7b6631a8a6db69221fda84162..62487c77f5d353e5d087776849f59c01f646e9cd 100644 (file)
--- 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.4)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AC_INIT([Evince],[0.6.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)
 
@@ -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,7 +40,7 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.5.2
+POPPLER_REQUIRED=0.5.3
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.8.15
 KEYRING_REQUIRED=0.4.0
@@ -49,6 +48,8 @@ KEYRING_REQUIRED=0.4.0
 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)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 poppler-glib >= $POPPLER_REQUIRED)
@@ -58,27 +59,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],
@@ -138,6 +166,14 @@ if test x$HAVE_NAUTILUS = "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
 
+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])
+fi
+AM_CONDITIONAL(HAVE_GTK_RECENT, test x$HAVE_GTK_RECENT = "xyes")
+
 dnl GConf configuration
 AM_GCONF_SOURCE_2
 
@@ -338,6 +374,12 @@ cut-n-paste/zoom-control/Makefile
 cut-n-paste/toolbar-editor/Makefile
 data/Makefile
 data/evince.desktop.in
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/48x48/Makefile
+data/icons/scalable/Makefile
+
 lib/Makefile
 pdf/Makefile
 pixbuf/Makefile
@@ -360,7 +402,7 @@ AC_OUTPUT
 
 echo "
 Configure summary:
-       Print Support......:  $enable_gnome_print
+       Print Support......:  $enable_print
        DBUS Support.......:  $enable_dbus
        Nautilus Plugin....:  $HAVE_NAUTILUS