From fae4de3c647dc77b6a91830de2e3d989d4c70824 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Thu, 12 Nov 2020 12:37:47 +0000 Subject: [PATCH] Ref #781: Display version numbers https://github.com/BestImageViewer/geeqie/issues/781 If the tag is at HEAD show the version number only, otherwise show version-date-commit --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 53aa267b..478283aa 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_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/]) +AC_INIT([geeqie], m4_translit(m4_esyscmd([if [ $(git tag --list 'v[1-9]*' --points-at HEAD | wc -c) -gt 0 ]; then git tag --list v[1-9]* --points-at HEAD | tail --lines=1 | tr --delete 'v' ; else 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; fi ]), 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" -- 2.20.1