[ooo-build] Building latest version on Ubuntu Jaunty

[Miklos Vajna]

On Fri, Mar 19, 2010 at 10:09:10PM +0000, Fridrich Strba <fstrba at novell.com> wrote:
> P.S. Any volunteer to modify our configure ?

I'm attaching two patches, the first one is a typo fix I found while
reading configure.in, the second is the one you requrested. With this
patch --without-git users are still not forced to have rsync installed.

I can push them, but I did not want to do so without getting an ACK from
somebody on this list. :)

Thanks.
-------------- next part --------------
From d4ceaba67aa084dea819481382091bffeaca5d6f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Sat, 20 Mar 2010 01:04:44 +0100
Subject: [PATCH 1/2] configure: Fix perl check.

* configure.in: Replace PERL with $PERL so that we don't always return
  true. ;-)
---
 configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index 6fc6788..93267ad 100644
--- a/configure.in
+++ b/configure.in
@@ -487,7 +487,7 @@ TOOLSDIR=$BASEDIR
 OOO_ADDITIONAL_SECTIONS=
 
 AC_PATH_PROG(PERL, perl)
-if test -z "PERL"; then
+if test -z "$PERL"; then
    AC_MSG_ERROR([perl not found; required for ooo-build])
 fi
 AC_SUBST(PERL)
-- 
1.7.0.2

-------------- next part --------------
From 165c014ecce9693b5ca1491030cf512899aa4250 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Sat, 20 Mar 2010 01:12:45 +0100
Subject: [PATCH 2/2] configure: check for rsync unless using --without-git

* configure.in: Add rsync check.
---
 configure.in |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index 93267ad..a448a81 100644
--- a/configure.in
+++ b/configure.in
@@ -1507,6 +1507,11 @@ else
         fi
     fi
     AC_MSG_RESULT([$RESULT])
+
+    AC_PATH_PROG(RSYNC, rsync)
+    if test -z "$RSYNC"; then
+        AC_MSG_ERROR([rsync not found; required for ooo-build when using --with-git])
+    fi
 fi
 AC_SUBST(OOO_GIT)
 
-- 
1.7.0.2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/ooo-build/attachments/20100320/83b997f6/attachment.pgp>