From 88f9e557bb93bdc4badc75b0ee8bf72c4dbfc2d9 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 9 Sep 2013 15:26:08 +0200 Subject: [PATCH] force git tag and configure.ac to say the same thing --- coreapi/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index 65a6fef70..ca91dd7c0 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -1,6 +1,7 @@ GITVERSION_FILE=liblinphone_gitversion.h GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp GITDESCRIBE=`git describe --always` +GIT_TAG=`git describe --abbrev=0` GITREVISION=`git rev-parse HEAD` ECHO=/bin/echo @@ -135,6 +136,10 @@ AM_CXXFLAGS=$(AM_CFLAGS) make_gitversion_h: if test "$(GITDESCRIBE)" != "" ; then \ + if test "$(GIT_TAG)" != $(PACKAGE_VERSION) ; then \ + echo "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \ + exit 1; \ + fi ; \ $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(GITDESCRIBE)\"" > $(GITVERSION_FILE_TMP) ; \ elif test "$(GITREVISION)" != "" ; then \ $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(LINPHONE_VERSION)_$(GITREVISION)\"" > $(GITVERSION_FILE_TMP) ; \