[ooo-build-commit] configure.in Makefile.am set_soenv.in

[Jan Holesovsky]

 Makefile.am  |    3 ++-
 configure.in |   17 +++++++++++++++++
 set_soenv.in |    2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 4fa8b03e0e8297f5daaec8ead0f7eb86a49f4979
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jul 3 16:48:41 2009 +0200

    Split build: Support for icecream & parallel build.
    
    And also a small m51-related build fix.
    
    * Makefile.am: Empty WITH_LANG, icecream support.
    * configure.in:
    * set_soenv.in:

diff --git a/Makefile.am b/Makefile.am
index ca03c48..348b3ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,8 @@ $(stampdir)/all: $(stampdir)/bootstrap
 	( . ./Linux*Env.Set.sh ; \
 	  export ULFEX=$(abs_srcdir)/build/bin/noulf ; \
 	  export ULFCONV=$(abs_srcdir)/build/bin/noulfconv ; \
-	  cd build ; build.pl --all ) && touch $@
+	  export WITH_LANG="" ; \
+	  cd build ; build.pl --all $$WITH_CPUS -- $$WITH_ICECREAM ) && touch $@
 
 $(stampdir)/bootstrap: Linux*Env.Set.sh
 	( . ./Linux*Env.Set.sh ; ./bootstrap ) && touch $@
diff --git a/configure.in b/configure.in
index a89325f..835ff87 100644
--- a/configure.in
+++ b/configure.in
@@ -782,6 +782,21 @@ AC_ARG_ENABLE(verbose,
 AC_ARG_WITH(ooo-prefix,
 [  --with-ooo-prefix       Where should be OOo installed
 ],OOO_PREFIX="$withval",OOO_PREFIX="\${libdir}/ooo3")
+AC_ARG_WITH(cpus,
+[  --with-cpus             Number of the CPUs to use for the parallel build.
+
+                          Usage: --with-cpus=4
+],if test "$withval" = "yes" ; then WITH_CPUS="" ; else WITH_CPUS="-P$withval" ; fi,WITH_CPUS="")
+AC_ARG_WITH(icecream,
+[  --with-icecream         Whether 'icecream' should be used to speed up the
+                          build.  The value means how many jobs (max) should
+                          be used for compilation.
+
+                          Use --with-gcc-home if you have icecream somewhere
+                          else than in /opt/icecream/bin.
+
+                          Usage: --with-icecream=10
+],if test "$withval" = "yes" ; then WITH_ICECREAM="-P10" ; else WITH_ICECREAM="-P$withval" ; fi ; PATH="/opt/icecream/bin:$PATH",WITH_ICECREAM="")
 
 BUILD_TYPE="OOo"
 
@@ -6407,6 +6422,8 @@ AC_SUBST(LOCAL_SOLVER)
 AC_SUBST(BUILD_TYPE)
 
 AC_SUBST(OOO_PREFIX)
+AC_SUBST(WITH_ICECREAM)
+AC_SUBST(WITH_CPUS)
 
 # make sure config.guess is +x; we execute config.guess, so it has to be so; 
 chmod +x ./config.guess
diff --git a/set_soenv.in b/set_soenv.in
index 165ecf5..f8b3bf9 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1695,6 +1695,8 @@ ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "MOC",               "@MOC@",              "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
+ToFile( "WITH_ICECREAM",     "@WITH_ICECREAM@",  "e" );
+ToFile( "WITH_CPUS",         "@WITH_CPUS@",      "e" );
 #
 # Writing the platform dependent constant values to file.
 # (c = comment, e = environment variable, a = alias )