From 32276e9afbe98c3da85c2b4322ee09556f3ee4fd Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Wed, 23 Jan 2013 18:57:46 +0100 Subject: [PATCH] configure: fix RPM_RELEASE Use git to get RPM_RELEASE only if this is a git repo clone and if the git command is available on the system. Signed-off-by: Danny Al-Gaaf --- configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b67e5cd39c3..f87140fc20e 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,15 @@ AC_PREREQ(2.59) AC_INIT([ceph], [0.56], [ceph-devel@vger.kernel.org]) # Create release string. Used with VERSION for RPMs. +RPM_RELEASE=0 AC_SUBST(RPM_RELEASE) -RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; else echo "0"; fi` +if test -d ".git" ; then + AC_CHECK_PROG(GIT_CHECK, git, yes) + if test x"$GIT_CHECK" = x"yes"; then + RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; else echo "0"; fi` + fi +fi +AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE']) AC_CONFIG_MACRO_DIR([m4]) -- 2.47.3