From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Wed, 2 Jun 2010 15:47:13 +0000 (-0700)
Subject: build: redo GR_GIT for portability
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=35940091f03b80c2611bcbeca0da343a4371f7c1;p=debian%2Fgnuradio

build: redo GR_GIT for portability
---

diff --git a/config/gr_git.m4 b/config/gr_git.m4
index 5e8aa663..c4f1ea0c 100644
--- a/config/gr_git.m4
+++ b/config/gr_git.m4
@@ -30,18 +30,23 @@ AC_DEFUN([GR_GIT],[
       AC_MSG_CHECKING([git description of current commit])
       if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
         GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
-	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'`
         # Release candidate tags create an extra -rcX field
-	if test x`echo $GIT_DESCRIBE | cut -f 1- -d '-' --output-delimiter=' ' | wc -w` = x4; then
-	  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'`
-	fi
+	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])
+        AC_MSG_RESULT([no tag in history, using current commit])
 	GIT_TAG=''
 	GIT_SEQNO=''
 	GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`
diff --git a/gr-howto-write-a-block/config/gr_git.m4 b/gr-howto-write-a-block/config/gr_git.m4
index 5e8aa663..c4f1ea0c 100644
--- a/gr-howto-write-a-block/config/gr_git.m4
+++ b/gr-howto-write-a-block/config/gr_git.m4
@@ -30,18 +30,23 @@ AC_DEFUN([GR_GIT],[
       AC_MSG_CHECKING([git description of current commit])
       if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
         GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
-	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'`
         # Release candidate tags create an extra -rcX field
-	if test x`echo $GIT_DESCRIBE | cut -f 1- -d '-' --output-delimiter=' ' | wc -w` = x4; then
-	  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'`
-	fi
+	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])
+        AC_MSG_RESULT([no tag in history, using current commit])
 	GIT_TAG=''
 	GIT_SEQNO=''
 	GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`