From 2f2e67b88935259b6e1c214a2c70b4c964f59028 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sun, 16 Feb 2014 22:27:22 +0100
Subject: Add option to disable icon cache update

---
 Makefile.am       | 2 +-
 configure.ac      | 7 +++++++
 icons/Makefile.am | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 33057f9..dffd58f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = po po-locations libmateweather doc data python icons
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-icon-update
 
 EXTRA_DIST = \
 	autogen.sh
diff --git a/configure.ac b/configure.ac
index 4a0e70c..44fb8eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,13 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
 AM_GLIB_GNU_GETTEXT
 
+dnl icon cache
+AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update],
+[Disable icon cache update]))
+if (test "$enable_icon_update" != no); then
+AC_PATH_PROG(UPDATE_ICON_CACHE, [gtk-update-icon-cache])
+fi
+AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
 dnl ***************************************************************************
 dnl ***  REGEX                                                              ***
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 3bfe3ac..cc14206 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -483,9 +483,9 @@ uninstall-icons:
 	done
 
 update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
+	@-if test -z "$(DESTDIR)" && ICON_UPDATE; then \
 		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache) $(DESTDIR)$(datadir)/$(subdir)/mate; \
+		$(UPDATE_ICON_CACHE) $(DESTDIR)$(datadir)/$(subdir)/mate; \
 	else \
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/$(subdir)/mate"; \
-- 
cgit v1.2.1