[ooo-build-commit] .: configure.in

Fridrich Strba fridrich at kemper.freedesktop.org
Tue Sep 28 03:16:44 PDT 2010


 configure.in |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bdf4c06e89e57d6176ad3abaf0c64aa06143590a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 28 12:16:23 2010 +0200

    Fix cloning urls

diff --git a/configure.in b/configure.in
index af9fc33..189381f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 3.2.99.1)
+AC_INIT(libreoffice-build, 3.2.99.1)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
@@ -499,7 +499,7 @@ OOO_ADDITIONAL_SECTIONS=
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
-   AC_MSG_ERROR([perl not found; required for ooo-build])
+   AC_MSG_ERROR([perl not found; required for libreoffice])
 fi
 AC_SUBST(PERL)
 INTLTOOL_PERL=$PERL
@@ -578,7 +578,7 @@ fi
 AC_SUBST(OOO_SOURCEVERSION)
 
 # source dir name
-OOO_SOURCEDIRNAME=ooo-build-$OOO_SOURCEVERSION
+OOO_SOURCEDIRNAME=libreoffice-$OOO_SOURCEVERSION
 AC_SUBST(OOO_SOURCEDIRNAME)
 
 AC_MSG_CHECKING([for split sources])
@@ -1196,7 +1196,7 @@ if test -n "$enable_mono" ; then
         mono_enabled=no
     fi
 else
-    # mono is not explicitly requested. Though, ooo-build will install
+    # mono is not explicitly requested. Though, libreoffice will install
     # the extra sources to support the build with mono
     mono_enabled=supported
     ENABLE_MONO=SUPPORTED
@@ -1535,14 +1535,14 @@ AC_MSG_CHECKING([whether to use git to get the ooo sources])
 OOO_GIT=
 CLONEDIR="$BASEDIR/clone"
 RAWBUILDDIR="$BASEDIR/rawbuild"
-if test \( -z "$with_git" -a -f "$SRCDIR/ooo-build-$OOO_SOURCEVERSION-bootstrap.tar.bz2" \) -o "$with_git" = "no"; then
+if test \( -z "$with_git" -a -f "$SRCDIR/libreoffice-$OOO_SOURCEVERSION-bootstrap.tar.bz2" \) -o "$with_git" = "no"; then
     AC_MSG_RESULT([no])
 else
-    OOO_GIT="git://anongit.freedesktop.org/git/ooo-build"
+    OOO_GIT="git://anongit.freedesktop.org/git/libreoffice"
     if test "$with_git" != "yes" ; then
         OOO_GIT="$with_git"
     else
-        guess=`git config remote.origin.url | sed 's#/ooo-build$##'`
+        guess=`git config remote.origin.url | sed 's#/build$##'`
         if test -n "$guess" ; then
             OOO_GIT="$guess"
         fi
@@ -1555,7 +1555,7 @@ else
 
     AC_PATH_PROG(RSYNC, rsync)
     if test -z "$RSYNC"; then
-        AC_MSG_ERROR([rsync not found; required for ooo-build when using --with-git])
+        AC_MSG_ERROR([rsync not found; required for libreoffice when using --with-git])
     fi
 fi
 AC_SUBST(OOO_GIT)


More information about the ooo-build-commit mailing list