From 3409a40cddec22d49b60517ef04d57573fdb3daa Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 30 Dec 2016 00:54:33 +0100
Subject: [PATCH] get git version when running configure

---
 autogen.sh      | 9 ---------
 configure.ac    | 2 +-
 m4/acinclude.m4 | 5 -----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8835c1826..090b63e2d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,4 @@
 #!/usr/bin/env bash
-  gajimversion="0.16.10.2"
-  if [ -d ".hg" ]; then
-    node=$(hg  tip --template "{node}")
-    hgversion="-${node:0:12}"
-  else
-    hgversion=""
-  fi
-  echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4
-
   AM_ARGS="--add-missing --gnu --copy -Wno-portability"
   CONF_ARGS=""
 
diff --git a/configure.ac b/configure.ac
index 6b1b5ee7e..f94b22bb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		["version-set-in-hgversion"],[http://trac.gajim.org/],[gajim])
+		m4_esyscmd_s([python -c "import os;os.chdir('src');from common import defs; print defs.version"]),[https://dev.gajim.org/gajim/gajim],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 4a356b520..deebd2bf8 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -47,8 +47,3 @@ AC_DEFUN([AS_AC_EXPAND],
   prefix=$prefix_save
   exec_prefix=$exec_prefix_save
 ])
-
-# Fix autoconf: They don't allow shell variables in AC_INIT
-# So we have to define them via m4 to be accepted....
-
-m4_include(m4/hgversion.m4)