From 19fda2211a365c7ec0b298fe722289419f47ffcb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 02 May 2007 15:41:47 +0000 Subject: Add --disable-thumbnailer (#434825) 2007-05-02 Ross Burton * configure.ac: * Makefile.am: Add --disable-thumbnailer (#434825) svn path=/trunk/; revision=2431 --- diff --git a/ChangeLog b/ChangeLog index 9243bf3..e484d17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2007-05-02 Ross Burton + * configure.ac: + * Makefile.am: + Add --disable-thumbnailer (#434825) + +2007-05-02 Ross Burton + * shell/ev-window.c: Add missing includes, fix indentation. diff --git a/Makefile.am b/Makefile.am index f1c4889..14f3b1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,11 +5,14 @@ SUBDIRS = \ libdocument \ properties \ shell \ - thumbnailer \ po \ help \ test +if ENABLE_THUMBNAILER +SUBDIRS += thumbnailer +endif + # Applications intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in diff --git a/configure.ac b/configure.ac index 5224e0d..cdac42b 100644 --- a/configure.ac +++ b/configure.ac @@ -169,6 +169,19 @@ if test x$HAVE_NAUTILUS = "xyes"; then fi AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes") + +dnl Check for thumbnailer build +AC_ARG_ENABLE(thumbnailer, + AC_HELP_STRING([--disable-thumbnailer],[disable the GNOME thumbnailer]), + [case "${enableval}" in + yes) ENABLE_THUMBNAILER=yes ;; + no) ENABLE_THUMBNAILER=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-thumbnailer) ;; + esac], + [ENABLE_THUMBNAILER=yes]) dnl Default value +AM_CONDITIONAL(ENABLE_THUMBNAILER, test x$ENABLE_THUMBNAILER = "xyes") + + dnl Check for GtkRecent PKG_CHECK_MODULES(GTK_RECENT, gtk+-2.0 >= 2.10.0, [HAVE_GTK_RECENT=yes], [HAVE_GTK_RECENT=no]) @@ -458,6 +471,7 @@ Configure summary: Print Support......: $enable_print DBUS Support.......: $enable_dbus Nautilus Plugin....: $HAVE_NAUTILUS + Thumbnailer........: $ENABLE_THUMBNAILER Gtk-Doc Support....: $enable_gtk_doc PDF Backend........: $enable_pdf -- cgit v0.9.1