X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgr_git.m4;h=c4f1ea0c027eb532f55abc2f98e142c80acbea5c;hb=d46b800b882724c07975f1dc897f8166d45150fb;hp=e274607137fcfea6a8ea63fc82321569e52b9ea4;hpb=c6b4290d73069e4e4f0f71b04a65b9670318e86d;p=debian%2Fgnuradio

diff --git a/config/gr_git.m4 b/config/gr_git.m4
index e2746071..c4f1ea0c 100644
--- a/config/gr_git.m4
+++ b/config/gr_git.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2009 Free Software Foundation, Inc.
+dnl Copyright 2009,2010 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -29,14 +29,35 @@ AC_DEFUN([GR_GIT],[
       AC_MSG_RESULT([ok])
       AC_MSG_CHECKING([git description of current commit])
       if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
-        GIT_VERSION=`cd $srcdir && $GIT describe --abbrev=8 | cut -f 2- -d '-'`
-        AC_MSG_RESULT([$GIT_DESCRIBE])
+        GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
+        # Release candidate tags create an extra -rcX field
+	case $GIT_DESCRIBE in
+	  *-*-*-*)
+	    GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
+	    GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
+	    GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
+	    ;;
+	  *-*-*)
+	    GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
+ 	    GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
+	    GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
+	    ;;
+	esac
+
+	AC_MSG_RESULT([$GIT_DESCRIBE])
       else
-        AC_MSG_RESULT([unable to find, using current commit])
-	GIT_VERSION=`cd $srcdir && $GIT describe --always --abbrev=8`
+        AC_MSG_RESULT([no tag in history, using current commit])
+	GIT_TAG=''
+	GIT_SEQNO=''
+	GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`
       fi
     else
       AC_MSG_RESULT([not found])
     fi
+
+    AC_SUBST([GIT_DESCRIBE])
+    AC_SUBST([GIT_TAG])
+    AC_SUBST([GIT_SEQNO])
+    AC_SUBST([GIT_COMMIT])
   fi
 ])