[ooo-build-commit] .: configure.in

[Jan Holesovsky]

 configure.in |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 667d50fe5d4d35c2587a998b13fab8188e20f587
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Aug 26 18:27:55 2010 +0200

    Implement --enable-icecream configure switch.
    
    It sets up the gcc home to /opt/icecream, and sets the max number of jobs per
    one dmake to 10.

diff --git a/configure.in b/configure.in
index 243b5b3..2acf2ab 100644
--- a/configure.in
+++ b/configure.in
@@ -821,6 +821,13 @@ AC_ARG_ENABLE(verbose,
 AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking  Disables generation of dependency information.
 ],,)
+AC_ARG_ENABLE(icecream,
+[  --enable-icecream       Use the 'icecream' distributed compiling tool to
+                          speedup the compilation.  It defaults to
+                          /opt/icecream for the location of the icecream
+                          gcc/g++ wrappers, you can override that using
+                          --with-gcc-home=/the/path switch.
+],,)
 AC_ARG_WITH(num-cpus,
 [  --with-num-cpus         Number of build processes/cpus to use (number of
                           projects that will build at the same time).
@@ -832,8 +839,9 @@ AC_ARG_WITH(max-jobs,
 [  --with-max-jobs         Maximum number of jobs per one CPU that will be
                           issued at the same time my dmake. The real number of
                           the jobs is affected by the --with-num-cpus too, it
-                          can get up to CPUS*max_jobs. Defaults to 1.],
-,)
+                          can get up to CPUS*max_jobs. Defaults to 1, unless
+                          you configure --enable-icecream - then to 10.
+],,)
 
 BUILD_TYPE="OOo"
 
@@ -1417,7 +1425,11 @@ dnl  The check for the c++ compiler is later on.
 dnl ===================================================================
 AC_MSG_CHECKING([gcc home])
 if test -z "$with_gcc_home"; then
-	GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
+   if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+      GCC_HOME="/opt/icecream"
+   else
+      GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
+   fi
 else	
 	GCC_HOME="$with_gcc_home"
 fi
@@ -7007,6 +7019,10 @@ if test "z$with_max_jobs" != "z"; then
         with_max_jobs="10"
     fi
     BUILD_MAX_JOBS="$with_max_jobs"
+else
+   if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+      BUILD_MAX_JOBS="10"
+   fi
 fi
 AC_MSG_RESULT([$BUILD_MAX_JOBS])
 AC_SUBST(BUILD_MAX_JOBS)