Make pdf compilation optional. See bug #38007.

2006-11-30  Yevgen Muntyan  <muntyan@tamu.edu>

	* Makefile.am:
	* backend/Makefile.am:
	* backend/ev-document-factory.c: (ev_document_factory_add_filters):
	* configure.ac:
	* shell/ev-window.c: (build_comments_string):

	Make pdf compilation optional. See bug #38007.

diff --git a/ChangeLog b/ChangeLog
index fdfb9e1785e68af721d4738ff68a8522579eb9c7..d0a8f3ee069feb36367264d176889007f069bc16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-30  Yevgen Muntyan  <muntyan@tamu.edu>
+
+       * Makefile.am:
+       * backend/Makefile.am:
+       * backend/ev-document-factory.c: (ev_document_factory_add_filters):
+       * configure.ac:
+       * shell/ev-window.c: (build_comments_string):
+       
+       Make pdf compilation optional. See bug #38007.
+
 2006-11-30  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * ps/ps.c: (get_next_text):

diff --git a/Makefile.am b/Makefile.am
index 5c04b74f11981c11b5cce539d20f05a04c80e436..c2162923bcc086c0cab0b6a300092cb2e2e12da5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,9 @@ SUBDIRS = cut-n-paste po help data
 
 # Backends
 
+if ENABLE_PDF
 SUBDIRS += pdf
+endif
 
 if ENABLE_PS 
 SUBDIRS += ps

diff --git a/backend/Makefile.am b/backend/Makefile.am
index f7ae5ec5d8b52d87301da17dfb93821cde09a793..bcf975a30e9d7529262be0331f567fb0bbec3cd6 100644 (file)
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -52,8 +52,12 @@ libevbackend_la_SOURCES=                     \
        ev-document-misc.h                      \
        ev-document-misc.c
 
-libevbackend_la_LIBADD =                               \
+libevbackend_la_LIBADD =
+
+if ENABLE_PDF
+libevbackend_la_LIBADD +=                      \
        $(top_builddir)/pdf/libpdfdocument.la
+endif
 
 if ENABLE_PS
 libevbackend_la_LIBADD +=                      \

diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index f524e1a0e0724f0f0e4a3be36527c3e812eea9d2..78be656cf1ff0cb7f9e6095321f1f22bba103da1 100644 (file)
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -65,8 +65,10 @@ struct _EvDocumentType
 };
 
 const EvDocumentType document_types[] = {
+#ifdef ENABLE_PDF
        /* PDF: */
        {"application/pdf",            EV_BACKEND_PDF,  pdf_document_get_type},
+#endif
 
 #ifdef ENABLE_PS
        /* Postscript: */
@@ -390,6 +392,7 @@ ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
        }
 #endif
 
+#ifdef ENABLE_PDF
        if (document == NULL || backend == EV_BACKEND_PDF) {
                default_filter = filter = gtk_file_filter_new ();
                gtk_file_filter_set_name (filter, _("PDF Documents"));
@@ -397,6 +400,7 @@ ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
                file_filter_add_mime_list_and_free (filter, mime_types);
                gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
        }
+#endif
 
 #ifdef ENABLE_PIXBUF
        if (document == NULL || backend == EV_BACKEND_PIXBUF) {

diff --git a/configure.ac b/configure.ac
index ed19edc80cb909ea914c39f1f5b63d92d71ce69a..a299f09420dc42982fb526f35a4dbd65ac4b2055 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -198,6 +198,7 @@ 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"
     else
            AC_MSG_WARN("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found")
     fi 

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 74426547d16cc9b8b88b177180b74fcbdbcfcf4f..98d888f41d940726b3724ee64f45fb50d98bc64c 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -80,7 +80,9 @@
 #include <gtk/gtkprintunixdialog.h>
 #endif
 
+#ifdef ENABLE_PDF
 #include <poppler.h>
+#endif
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
@@ -3088,6 +3090,7 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi
 static char *
 build_comments_string (void)
 {
+#ifdef ENABLE_PDF
        PopplerBackend backend;
        const char *backend_name;
        const char *version;
@@ -3109,6 +3112,9 @@ build_comments_string (void)
        return g_strdup_printf (_("PostScript and PDF File Viewer.\n"
                                  "Using poppler %s (%s)"),
                                version, backend_name);
+#else
+       return g_strdup_printf (_("Document Viewer."));
+#endif
 }
 
 static void