From fbbd58dc587bdd16edc7d780a17b4261d27478e6 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Sat, 7 Feb 2015 18:11:30 +0100
Subject: Allow setting ICECC_VERSION in the autogen.input.

That way you can avoid having to set ICECC_VERSION in every shell where you
want to use icecream with cross-compilation.  See

http://holesovsky.blogspot.cz/2015/02/using-icecream-to-speed-up-libreoffice.html

for details.

Change-Id: I1adf67934c2687f0fca1b73e7793b72120eeedab
---
 config_host.mk.in |  1 +
 configure.ac      | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index e8d0ec4851c0..1a28e6353557 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -268,6 +268,7 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
 export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
 export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
 export ICECREAM_RUN=@ICECREAM_RUN@
+@x_ICECC_VERSION@ export ICECC_VERSION=@ICECC_VERSION@
 export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@
 export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@
 export ICU_MAJOR=@ICU_MAJOR@
diff --git a/configure.ac b/configure.ac
index d8401fc5b4e7..0e27a30a04e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12636,6 +12636,17 @@ else
 fi
 AC_SUBST(ICECREAM_RUN)
 
+dnl ===================================================================
+dnl Setup the ICECC_VERSION for the build the same way it was set for
+dnl configure, so that CC/CXX and ICECC_VERSION are in sync
+dnl ===================================================================
+x_ICECC_VERSION=[\#]
+if test -n "$ICECC_VERSION" ; then
+    x_ICECC_VERSION=
+fi
+AC_SUBST(x_ICECC_VERSION)
+AC_SUBST(ICECC_VERSION)
+
 dnl ===================================================================
 
 AC_MSG_CHECKING([MPL subset])
-- 
cgit v1.2.3