ooo-build r13534 - in trunk: . bin

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Aug 12 20:05:28 2008
New Revision: 13534
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13534&view=rev

Log:
2008-08-12  Kohei Yoshida  <kyoshida novell com>

	* bin/setup.in:
	* bin/unpack:
	* configure.in:
	* download.in: added --enable-scsolver at ooo-build level.


Modified:
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Aug 12 20:05:28 2008
@@ -37,6 +37,7 @@
 USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@'
 ENABLE_MONO='@ENABLE_MONO@'
 ENABLE_MEDIAWIKI='@ENABLE_MEDIAWIKI@'
+ENABLE_SCSOLVER='@ENABLE_SCSOLVER@'
 ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
 GRAPHITE_SRC='@GRAPHITE_SRC@'
 PROPAGATED_ARGS="@PROPAGATED_ARGS@"

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Aug 12 20:05:28 2008
@@ -68,9 +68,11 @@
 	check_tarball $OOO_TARBALL
 fi
 
-# Check presence of scsolver (Calc Solver) package...
-SCSOLVER_PACKAGE=scsolver.2008-08-12.tar.bz2
-check_tarball $SRCDIR/$SCSOLVER_PACKAGE
+if test "$ENABLE_SCSOLVER" = "YES"; then
+    # Check presence of scsolver (Calc Solver) package...
+    SCSOLVER_PACKAGE=scsolver.2008-08-12.tar.bz2
+    check_tarball $SRCDIR/$SCSOLVER_PACKAGE
+fi
 
 mkdir -p $BUILDDIR
 cd $BUILDDIR
@@ -591,9 +593,11 @@
   tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
 fi
 
-# Unpack the scsolver package
-echo "Unpacking $SCSOLVER_PACKAGE"
-tar xfj $SRCDIR/$SCSOLVER_PACKAGE -C $OOBUILDDIR
+if test "$ENABLE_SCSOLVER" = "YES"; then
+    # Unpack the scsolver package
+    echo "Unpacking $SCSOLVER_PACKAGE"
+    tar xfj $SRCDIR/$SCSOLVER_PACKAGE -C $OOBUILDDIR
+fi
 
 # OxygenOffice extras
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug 12 20:05:28 2008
@@ -1052,7 +1052,7 @@
 AC_SUBST(ENABLE_MEDIAWIKI)
 
 AC_MSG_CHECKING([whether to enable the Calc Solver extension])
-if test "$enable_mediawiki" != "no" ; then
+if test "$enable_scsolver" != "no" ; then
     ENABLE_SCSOLVER=YES
     AC_MSG_RESULT([yes])
 else

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Aug 12 20:05:28 2008
@@ -315,7 +315,7 @@
     push @files, ( '@GRAPHITE_SRC@' );
 }
 
-if ('true' ne '') {
+if ('@ENABLE_SCSOLVER' ne 'YES') {
    push @files, ( 'scsolver.2008-08-12.tar.bz2' );
 }