ooo-build r11249 - in trunk: . bin

[strba svn gnome org]

Author: strba
Date: Fri Jan 11 21:10:51 2008
New Revision: 11249
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11249&view=rev

Log:
some more Solaris fine-tuning

Modified:
   trunk/ChangeLog
   trunk/bin/build-ooo
   trunk/configure.in

Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo	(original)
+++ trunk/bin/build-ooo	Fri Jan 11 21:10:51 2008
@@ -14,8 +14,8 @@
 fi
 
 if test "z`uname -s`" == "zSunOS"; then
-    if test -f /usr/sfw/bin/gtar; then
-    	(cd $OOOBUILDDIR/solenv/bin && ln -s /usr/sfw/bin/gtar tar)
+    if test -f $GNUTAR -a ! -f $OOBUILDDIR/solenv/bin/tar; then
+    	ln -s $GNUTAR $OOBUILDDIR/solenv/bin/tar
     fi
 fi
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan 11 21:10:51 2008
@@ -839,15 +839,17 @@
 GNUTAR=tar
 if test "z$with_gnu_tar" != "z"; then
     if test "z${with_gnu_tar%%/*}" = "z" ; then
-	# it's an absolute path
-	if test -f $with_gnu_tar ; then
-	    GNUTAR=$with_gnu_tar
-	else
-	    AC_MSG_ERROR([The file \"$with_gnu_tar\" does not exist.])
-	fi
+        # it's an absolute path
+        if test -f $with_gnu_tar ; then
+	        GNUTAR=$with_gnu_tar
+        else
+	        AC_MSG_ERROR([The file \"$with_gnu_tar\" does not exist.])
+        fi
     else
-	AC_MSG_ERROR([--with-gnu-tar requires an absolute path])
+        AC_MSG_ERROR([--with-gnu-tar requires an absolute path])
     fi
+elif test -f /usr/sfw/bin/gtar; then
+	GNUTAR="/usr/sfw/gin/gtar"
 fi
 AC_MSG_RESULT([$GNUTAR])
 AC_SUBST(GNUTAR)