[ooo-build-commit] .: bin/unpack configure.in distro-configs/OOo4Kids.conf.in

Eric Bachard ericb at kemper.freedesktop.org
Tue Apr 6 06:28:44 PDT 2010


 bin/unpack                      |   18 ++++++++++--------
 configure.in                    |    2 ++
 distro-configs/OOo4Kids.conf.in |    3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 4225dffe54d1bba9fbaa521009f9553b51c5ccb5
Author: Eric Bachard <ebachard at gnome.org>
Date:   Tue Apr 6 15:16:14 2010 +0200

    Add some changes for OOo4Kids distro
    
    M	bin/unpack
    M	configure.in
    M	distro-configs/OOo4Kids.conf.in
    
    *bin/unpack : avoid checking for apache-ant when building OOo4Kids
    *configure.in : adding VENDORNAME and OOo4Kids.conf in the list
    *distro-configs/OOo4Kids.conf.in : adding better configure options

diff --git a/bin/unpack b/bin/unpack
index 97aac54..72fa5bf 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -634,19 +634,21 @@ else
 
 fi
 
-APACHE_ANT='apache-ant-1.7.0'
-APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
+if test "z$DISTRO" != "zOOo4Kids"; then
+    APACHE_ANT='apache-ant-1.7.0'
+    APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
 
-if test "z$BUILD_WIN32" != "z"; then
-	check_file $SRCDIR/$APACHE_ANT_TARBALL
-else
+    if test "z$BUILD_WIN32" != "z"; then
+	    check_file $SRCDIR/$APACHE_ANT_TARBALL
+    else
 	ANT_VERSION=`ant -version | awk '{ print $4 }'`
 	if test -x /usr/bin/ant -a \
-	   "`echo $ANT_VERSION | cut -d. -f1`" -eq "1" \
-                -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" \
-                -a "`echo $DISTRO`" != "SUSE-10.1" ; then
+	    "`echo $ANT_VERSION | cut -d. -f1`" -eq "1" \
+		-a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" \
+		-a "`echo $DISTRO`" != "SUSE-10.1" ; then
 		check_file $SRCDIR/$APACHE_ANT_TARBALL
 	fi
+    fi
 fi
 
 if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
diff --git a/configure.in b/configure.in
index 9393ce1..a30aea9 100644
--- a/configure.in
+++ b/configure.in
@@ -678,6 +678,7 @@ case $DISTRO in
         PLD*) VENDORNAME="PLD" ;;
         OxygenOffice*) VENDORNAME="OxygenOffice" ;;
         FSFhu*) VENDORNAME="FSFhu" ;;
+	OOo4Kids*) VENDORNAME="EducOOo" ;;
         *) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
 esac
 AC_MSG_RESULT([$VENDORNAME])
@@ -1635,6 +1636,7 @@ distro-configs/DebianSarge.conf
 distro-configs/FSFhuLinux.conf
 distro-configs/FSFhuMacOSX.conf
 distro-configs/FSFhuWindows.conf
+distro-configs/OOo4Kids.conf
 distro-configs/OxygenOfficeLinux.conf
 distro-configs/OxygenOfficeWindows.conf
 distro-configs/UbuntuL10n.conf
diff --git a/distro-configs/OOo4Kids.conf.in b/distro-configs/OOo4Kids.conf.in
index 5574095..1c696ae 100644
--- a/distro-configs/OOo4Kids.conf.in
+++ b/distro-configs/OOo4Kids.conf.in
@@ -1,4 +1,5 @@
---disable-cups 
+--enable-presenter-extra-ui
+--enable-cups 
 --disable-neon 
 --disable-crashdump 
 --disable-fontconfig 


More information about the ooo-build-commit mailing list