X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=304219975be03d923d589d1aa2af04a4d23764e1;hb=1f4859f8061b8a03e8f75a5cbd26f16c19155670;hp=2b2b722c6a3fdf9d3fe05f88732bbe2bc3b7d3f6;hpb=949bd66322de613217672824798fbc7973c8b314;p=evince.git

diff --git a/configure.ac b/configure.ac
index 2b2b722c..30421997 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,6 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.5.4
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.8.15
 KEYRING_REQUIRED=0.4.0
@@ -53,9 +52,8 @@ 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 gnome-icon-theme >= $GNOME_ICON_THEME_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)
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
@@ -188,6 +186,31 @@ dnl ================== portability checks ======================================
 dnl for backtrace()
 AC_CHECK_HEADERS([execinfo.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)
+	    LIBS=$evince_save_LIBS
+    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")
@@ -329,7 +352,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)
@@ -338,12 +361,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
@@ -378,6 +402,7 @@ cut-n-paste/totem-screensaver/Makefile
 data/evince.desktop.in
 data/icons/16x16/Makefile
 data/icons/22x22/Makefile
+data/icons/24x24/Makefile
 data/icons/48x48/Makefile
 data/icons/Makefile
 data/icons/scalable/Makefile
@@ -408,6 +433,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