Add --disable-thumbnailer (#434825)

2007-05-02  Ross Burton  <ross@openedhand.com>

	* configure.ac:
	* Makefile.am:
	Add --disable-thumbnailer (#434825)

svn path=/trunk/; revision=2431

diff --git a/ChangeLog b/ChangeLog
index 9243bf3326029217cc7545bb4d7764027dbad92e..e484d173107861dba9e48a8884725839152c41b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-02  Ross Burton  <ross@openedhand.com>
+
+       * configure.ac:
+       * Makefile.am:
+       Add --disable-thumbnailer (#434825)
+
 2007-05-02  Ross Burton  <ross@openedhand.com>
 
        * shell/ev-window.c:

diff --git a/Makefile.am b/Makefile.am
index f1c48890cd7818ea9eb93e5a8f38ca59da5dfd17..14f3b1ede279f77d76f7dc89bf4c924e19a25458 100644 (file)
--- 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 5224e0da5478de4a0e1ba0dd6bb15cb43ea83241..cdac42bafd59fa62776b1d8cf0a5a6b1e6ddda75 100644 (file)
--- 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