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

[Petr Mladek]

 configure.in |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

New commits:
commit c3784a9a046d6b0bc8c58d4450b9c08c7d643595
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Mon Sep 13 15:52:11 2010 +0200

    some CVSTAG clean up; should get removed completely soon
    
    * guess the default tag from the ooo-build version; remove out-dated detection
      of split sources; check for the new source name

diff --git a/configure.in b/configure.in
index 0cfc8e1..67c12bd 100644
--- a/configure.in
+++ b/configure.in
@@ -3,11 +3,6 @@ AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-# ooo-build tag needed to get OOo sources from ooo-build git
-DEFAULT_TAG=ooo-build-3.2.98.0
-# For the upstream packages it is like:
-# DEFAULT_TAG=OOO320_m1
-
 # The option tar-ustar is necessary because of some patches have too long
 # names so that they cannot be archived using the old V7 format
 # This option has been supported since automake 1.8b
@@ -40,8 +35,8 @@ AC_ARG_WITH(source-version,
 
 AC_ARG_WITH(split,
 [
-  --with-split            adapt to the new package split for the source
-                            code, rather than the older version.],
+  --without-split         do not use the split package sources; use the upstream
+                          tarball or so],
 ,with_split=yes)
 
 AC_ARG_WITH(piece,
@@ -559,7 +554,7 @@ AC_SUBST(BUILD_WIN32)
 AM_CONDITIONAL(BUILD_WIN32, [test "$BUILD_WIN32" = yes])
 
 if test "z$with_tag" = "z"; then
-   with_tag=$DEFAULT_TAG
+   with_tag=ooo-build-$OOO_BUILDVERSION
 fi
 
 if test "z`uname -s`" = "zSunOS" -a -f /usr/xpg4/bin/grep ; then
@@ -606,10 +601,11 @@ AC_MSG_RESULT([$MWS])
 AC_SUBST(MWS)
 
 AC_MSG_CHECKING([for split sources])
-SPLIT=$with_split
-test -z "$SPLIT" && echo $CVSTAG | grep -q "dev300" && test `echo $CVSTAG | sed 's|dev300-m||'` -gt 21 && SPLIT=yes
-test -z "$SPLIT" && echo $CVSTAG | grep -q "ooo300" && SPLIT=yes
-test "$SPLIT" = "no" && SPLIT=
+if test "$with_split" = "no" ; then
+    SPLIT=
+else
+    SPLIT=yes
+fi
 AC_MSG_RESULT([${SPLIT:-no}])
 AC_SUBST(SPLIT)
 
@@ -1589,11 +1585,11 @@ else
 fi
 AC_MSG_RESULT([$build_product])
 
-AC_MSG_CHECKING([whether to use git to get the up-stream sources])
+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/$CVSTAG-bootstrap.tar.bz2" \) -o "$with_git" = "no"; then
+if test \( -z "$with_git" -a -f "$SRCDIR/ooo-build-$OOO_SOURCEVERSION-bootstrap.tar.bz2" \) -o "$with_git" = "no"; then
     AC_MSG_RESULT([no])
 else
     OOO_GIT="git://anongit.freedesktop.org/git/ooo-build"