[GRASS-SVN] r57675 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-09-13 22:01:35 -0700 (Fri, 13 Sep 2013)
New Revision: 57675

Modified:
   grass/branches/develbranch_6/configure
   grass/branches/develbranch_6/configure.in
Log:
support for newer svnversion output string (#587, merge from trunk)

Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure	2013-09-14 04:58:47 UTC (rev 57674)
+++ grass/branches/develbranch_6/configure	2013-09-14 05:01:35 UTC (rev 57675)
@@ -1319,7 +1319,7 @@
 
 if test "$SVN_VERSION" != "no" ; then
    GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
-   if test "$GRASS_VERSION_SVN" = "exported" ; then
+   if test "$GRASS_VERSION_SVN" = "exported" -o "$GRASS_VERSION_SVN" = "Unversioned directory" ; then
       GRASS_VERSION_SVN=
    fi
 fi

Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in	2013-09-14 04:58:47 UTC (rev 57674)
+++ grass/branches/develbranch_6/configure.in	2013-09-14 05:01:35 UTC (rev 57675)
@@ -130,7 +130,7 @@
 AC_PATH_PROG(SVN_VERSION, svnversion, no)
 if test "$SVN_VERSION" != "no" ; then
    GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
-   if test "$GRASS_VERSION_SVN" = "exported" ; then
+   if test "$GRASS_VERSION_SVN" = "exported" -o "$GRASS_VERSION_SVN" = "Unversioned directory" ; then
       GRASS_VERSION_SVN=
    fi
 fi