From c2a0d3b969b32303d22ef06ddb70ca1431d3607f Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 22 Jan 2008 13:21:29 +0100
Subject: [PATCH] Use git tools instead of cogito for getting the build ID

The build ID now includes both last tagged version, commit generation
since last tagged version, as well as the leading characters of the
commit ID and a flag for dirty working tree.
---
 Makefile.config.in | 2 +-
 configure.in       | 2 +-
 src/Makefile       | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index ad44eb87..81f792ef 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -53,7 +53,7 @@ ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CC = @CC@
-CG_COMMIT_ID = @CG_COMMIT_ID@
+GIT = @GIT@
 CONFDIR = @CONFDIR@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
diff --git a/configure.in b/configure.in
index f47764d4..7b6a826f 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AC_PATH_PROGS(AWK, "$AWK")
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 
-AC_PATH_PROGS(CG_COMMIT_ID, "cg-commit-id")
+AC_PATH_PROGS(GIT, "git")
 AC_PATH_PROGS(SPARSE, "sparse")
 
 CONFIG_ASCIIDOC="no"
diff --git a/src/Makefile b/src/Makefile
index 96121af1..0fc6664f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,8 +28,10 @@ SUBDIRS = \
  viewer
 
 # Get the GIT HEAD ID if possible
-ifdef CG_COMMIT_ID
-BUILD_ID=$(shell GIT_DIR=$(top_srcdir)/.git $(CG_COMMIT_ID) 2> /dev/null)
+ifdef GIT
+GITDESC  = $(shell $(GIT) --git-dir=$(top_srcdir)/.git describe 2>/dev/null)
+WTDIRTY  = $(shell $(GIT) --git-dir=$(top_srcdir)/.git diff-index HEAD 2>/dev/null)
+BUILD_ID = $(subst elinks-,,$(GITDESC))$(if $(WTDIRTY),-dirty)
 endif
 INCLUDES += -DBUILD_ID="\"$(BUILD_ID)\""