[ooo-build-commit] .: configure.in patches/dev300

[Michael Meeks]

 configure.in         |    6 +++---
 patches/dev300/apply |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8b7f98ad01b8533ec980a426cd9bc2ce0075aedb
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Sep 29 22:36:38 2010 +0100

    disable missing patch for now...

diff --git a/configure.in b/configure.in
index 189381f..3fe482a 100644
--- a/configure.in
+++ b/configure.in
@@ -654,8 +654,9 @@ fi
 AC_MSG_CHECKING([for distribution name])
 case "$with_distro" in
     ""|"yes"|"no") distros_list=`ls distro-configs/*.conf.in | sort | sed -e "s|distro-configs/\(.*\).conf.in|\t\1|g"`
-        AC_MSG_ERROR([A distribution must be selected by the option --with-distro. You can choose one from:
+        AC_MSG_WARNING([A distribution could be selected by the option --with-distro. You can choose one from:
 $distros_list])
+	DISTRO="RAW"
         ;;
     NLD) DISTRO="SUSE"
         ;;
@@ -683,13 +684,12 @@ case $DISTRO in
         Pardus*) VENDORNAME="Pardus" ;;
         rPath*|rpl*) VENDORNAME="rPath" ;;
         SUSE*|Novell*|NLD*) VENDORNAME="Novell" ;;
-        GoOo*|Raw) VENDORNAME="Go-oo Project" ;;
         Slackware*) VENDORNAME="Slackware" ;;
         PLD*) VENDORNAME="PLD" ;;
         OxygenOffice*) VENDORNAME="OxygenOffice" ;;
         FSFhu*) VENDORNAME="FSFhu" ;;
         OOo4Kids*) VENDORNAME="EducOOo" ;;
-		LibreOffice*) VENDORNAME="The Document Foundation" ;;
+		LibreOffice*|Raw) VENDORNAME="The Document Foundation" ;;
         *) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
 esac
 AC_MSG_RESULT([$VENDORNAME])
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9cbe01f..f140b34 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -179,7 +179,7 @@ cws-koheichart02-xmloff.diff, kohei
 # Don't stat tons of config files we don't need to read on startup
 # speed-configmgr.diff, i#56783, michael - CHECK ME !
 # Don't spawn pointless processes to work out things we know at compile time
-speed-soffice-sh.diff, i#106891, michael
+# speed-soffice-sh.diff, i#106891, michael
 
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei