Merge branch 'git-configure' into cocospec

configure.ac

-define([gitversion], esyscmd([sh -c "git log --oneline | wc -l | tr -d '\n'"]))
-define([gitbranch], esyscmd([sh -c "git branch | grep \* | cut -d ' ' -f2"]))
 AC_INIT([lustrec], 1.5-gitversion, [ploc@garoche.net])
+
+gitbranch=`git branch | grep \* | sed "s/\*[ ]*//"`
+define([gitversion], esyscmd([sh -c "git log --oneline | wc -l | tr -d '\n'"]))
+#define([gitbranch], esyscmd([sh -c "git branch | grep \* | cut -d ' ' -f2"]))
+
 AC_SUBST(VERSION_CODENAME, "Xia/Shao Kang-dev")
-AC_SUBST(GITBRANCH, gitbranch)
+
+AC_SUBST(GITBRANCH, "$gitbranch")
 if test x"$GITBRANCH" != "xmaster"; then
   AC_SUBST(CDASHSUBPROJ, "unstable")
 else