[ooo-build-commit] .: 2 commits - configure.in README

[Michael Meeks]

 README       |   34 +++++++++++++++-------------------
 configure.in |   31 +++++++++++++++++--------------
 2 files changed, 32 insertions(+), 33 deletions(-)

New commits:
commit 432ce048e502a9a3ce502048836e0a218ff569f9
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 1 14:06:18 2010 +0100

    Fix the readme, bug xdg#30526

diff --git a/README b/README
index 1d5105f..d84e5eb 100644
--- a/README
+++ b/README
@@ -1,29 +1,25 @@
-OpenOffice.org build:
+* Welcome to LibreOffice *
 
-	This package contains Desktop integration work for
-OpenOffice.org, several back-ported features & speedups, and a much
-simplified build wrapper, making an OO.o build / install possible for
-the common man.[1]
+	Welcome to LibreOffice. This package is just a shim that sits
+around, and makes it easy to work with the bulk of the code. This is
+downloaded from a source archive, or git (if configured with
+--with-git) by the download.sh shell script.
 
-	The latest version of this code can be obtained by
-anonymous Git with this command:
+	You will need around 6Gb of spare disk space to build, install
+and have space to have a copy or two. The latest version of this code
+can be obtained by anonymous Git with this command:
 
-	git clone git://anongit.freedesktop.org/ooo-build/ooo-build
+	git clone git://anongit.freedesktop.org/git/libreoffice/build
 
 	Packaged releases can be found from:
+		http://libreoffice.org/download/
 
-		http://download.go-oo.org/
-
-	More documentation is in the
-
-		git://anongit.freedesktop.org/ooo-build/website
-
-repository, the latest version of which is also at http://go-oo.org/
+	More documentation is in the wiki:
+		http://www.freedesktop.org/wiki/Software/LibreOffice/HowToBuild
 
 	Finally, you can subscribe to the development mailing list at
-http://lists.freedesktop.org/mailman/listinfo/ooo-build
+http://lists.freedesktop.org/mailman/listinfo/libreoffice and please
+share your pain and frustration with build issues on IRC at
+irc.freenode.net in #libreoffice.
 
 	Happy hacking.
-
-[1] - assuming the common man has 4Gb+ of spare space, and lots of
-      idle CPU time.
commit a3ffcef4c0df3ebbdb5ef433f06f5849289c52be
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 1 11:52:25 2010 +0100

    don't warn about other distros if built with --with-git

diff --git a/configure.in b/configure.in
index 5aea141..80c41b6 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,20 @@ AC_SUBST(OOO_BUILDVERSION)
 PROPAGATED_ARGS=$ac_configure_args
 AC_SUBST(PROPAGATED_ARGS)
 
+AC_ARG_WITH(git,
+[
+  --with-git              Use git to get the up-stream sources instead of
+                          downloading and unpacking the tarballs.
+
+                          Recommended for developers, but not for package
+                          maintainers.],
+,)
+
+AC_ARG_WITH(git-managed,
+[
+  --with-git-managed      Use GIT to manage your patches],
+,)
+
 AC_ARG_WITH(source-version,
 [
   --with-source-version   define another version for the ooo source tarballs
@@ -448,19 +462,6 @@ AC_ARG_WITH(drink,
                           Example: --with-drink=coffee],
 ,)
 
-AC_ARG_WITH(git,
-[
-  --with-git              Use git to get the up-stream sources instead of
-                          downloading and unpacking the tarballs.
-
-                          Recommended for developers, but not for package
-                          maintainers.],
-,)
-AC_ARG_WITH(git-managed,
-[
-  --with-git-managed      Use GIT to manage your patches],
-,)
-
 dnl
 dnl Items here only to make --help work nicely:
 dnl
@@ -654,8 +655,10 @@ 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_WARN([A distribution could be selected by the option --with-distro. You can choose one from:
+        if test "z$with_git" == "z"; then
+            AC_MSG_WARN([A distribution could be selected by the option --with-distro. You can choose one from:
 $distros_list])
+        fi
 	DISTRO="LibreOfficeLinuxDevel"
         ;;
     NLD) DISTRO="SUSE"