diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | gcr/icons/Makefile.am | 3 |
4 files changed, 16 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 90cd53d..53a9ddb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-strict \ --disable-coverage \ --disable-update-mime \ + --disable-update-icon-cache \ --with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib/ DISTCLEANFILES = \ @@ -48,4 +49,4 @@ dist-hook: check-memory: make -C egg check-memory make -C gck check-memory - make -C gcr check-memory
\ No newline at end of file + make -C gcr check-memory @@ -1,3 +1,8 @@ +gcr 3.3.92: + - Fix up copyright headers + - Updated translations + - Build fix + gcr 3.3.90: - Expose the secure memory API diff --git a/configure.ac b/configure.ac index f9baabe..0eba81d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([gcr], [3.3.90], +AC_INIT([gcr], [3.3.92], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-keyring&component=gcr], [gcr]) @@ -170,6 +170,11 @@ AC_ARG_ENABLE(update-mime, [don't run update-mime-database utility (useful for packages) ])) AM_CONDITIONAL(WITH_UPDATE_MIME, test "$enable_update_mime" != "no") +AC_ARG_ENABLE(update-icon-cache, + AC_HELP_STRING([--disable-update-icon-cache], + [don't run gtk-update-icon-cache utility (useful for packages) ])) +AM_CONDITIONAL(WITH_UPDATE_ICON_CACHE, test "$enable_update_icon_cache" != "no") + # ---------------------------------------------------------------------- # DBus services diff --git a/gcr/icons/Makefile.am b/gcr/icons/Makefile.am index 8b662b2..65da739 100644 --- a/gcr/icons/Makefile.am +++ b/gcr/icons/Makefile.am @@ -11,6 +11,8 @@ EXTRA_DIST = \ src \ render-icons.py +if WITH_UPDATE_ICON_CACHE + gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: @@ -21,6 +23,7 @@ install-data-hook: echo "*** Icon cache not updated. After install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ fi +endif render: python render-icons.py |