From: Colin Clark <colin.clark@cclark.uk>
Date: Sat, 8 Aug 2020 13:23:18 +0000 (+0100)
Subject: Fix #781: Running 'make check' in po folder errors out
X-Git-Tag: v1.6~27
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=d43baf2c1b499a05cebc171550f3891d0cf53537

Fix #781: Running 'make check' in po folder errors out

https://github.com/BestImageViewer/geeqie/issues/781

Spurious newline removed, and version now also includes last release tag
and date.
---

diff --git a/configure.ac b/configure.ac
index 07cc5667..2bd4ca7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie@freelists.org], [], [http://www.geeqie.org/])
+AC_INIT([geeqie], m4_translit(m4_esyscmd([git tag --list v[1-9]* | tail --lines=1 | tr --delete 'v' && echo "+git" && git log --max-count=1 --date=format:"%Y%m%d" --format="%ad" && echo "-" && git rev-parse --quiet --verify --short HEAD]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/])
 
 # Add -Werror to the default CFLAGS
 CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"