[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

Petr Mladek pmladek at suse.cz
Tue Feb 5 07:13:35 PST 2013


 configure.ac |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 3251bb47527ebbc657902ad229ac1e076bf28c2a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Feb 5 15:18:43 2013 +0100

    use "icerun" wrapper only when available
    
    It is not provided by the old icecram-0.9.2 on SLED11
    
    Change-Id: If8dc9b028276ac05733eb59c1ec62e352f4a2796
    Reviewed-on: https://gerrit.libreoffice.org/2000
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/configure.ac b/configure.ac
index 0cbc7e8..5bdbd37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12025,9 +12025,13 @@ dnl icerun is a wrapper that stops us spawning tens of processes
 dnl locally - for tools that can't be executed on the compile cluster
 dnl this avoids a dozen javac's ganging up on your laptop to kill it.
 dnl ===================================================================
+AC_MSG_CHECKING([whether to use icerun wrapper])
 ICECREAM_RUN=
-if test "$enable_icecream" = "yes"; then
-   ICECREAM_RUN=icerun
+if test "$enable_icecream" = "yes" && which icerun >/dev/null 2>&1 ; then
+    ICECREAM_RUN=icerun
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ICECREAM_RUN)
 


More information about the Libreoffice-commits mailing list