From aee9d4f626155748961757371b65cc34700edc38 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Thu, 4 Jul 2024 19:12:44 +0200 Subject: [PATCH] configure test --- configure | 9 ++++++--- configure.ac | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/configure b/configure index d2d26942c..c03234dd9 100755 --- a/configure +++ b/configure @@ -694,6 +694,7 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM INCLUDES +CLIXON_VERSION_PATCH CLIXON_VERSION_MINOR CLIXON_VERSION_MAJOR CLIXON_VERSION @@ -2811,11 +2812,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # where autotool scripts are: install-sh, config.sub, config.guess -CLIXON_VERSION_MAJOR="7" -CLIXON_VERSION_MINOR="1" -CLIXON_VERSION_PATCH="0" + # Use GIT, if this does not work, need a fallback mechanism CLIXON_VERSION="$(git log --pretty="format:%(describe) %ci" -n1)" +CLIXON_VERSION_MAJOR="$(echo $CLIXON_VERSION | awk -F "." '{print $1}')" +CLIXON_VERSION_MINOR="$(echo $CLIXON_VERSION | awk -F "." '{print $2}')" +CLIXON_VERSION_PATCH="$(echo $CLIXON_VERSION | awk -F "." '{print $3}' | awk -F " " '{print $1}')" # Debug flag # Check whether --enable-debug was given. @@ -4016,6 +4018,7 @@ test -n "$target_alias" && + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}" >&5 printf "%s\n" "CLIXON version is ${CLIXON_VERSION}" >&6; } diff --git a/configure.ac b/configure.ac index a4131d741..3dd47f1b5 100644 --- a/configure.ac +++ b/configure.ac @@ -48,11 +48,12 @@ AC_CONFIG_SRCDIR([lib/clixon/clixon.h.in]) # where autotool scripts are: install-sh, config.sub, config.guess AC_CONFIG_AUX_DIR(config-aux) -CLIXON_VERSION_MAJOR="7" -CLIXON_VERSION_MINOR="1" -CLIXON_VERSION_PATCH="0" + # Use GIT, if this does not work, need a fallback mechanism CLIXON_VERSION="$(git log --pretty="format:%(describe) %ci" -n1)" +CLIXON_VERSION_MAJOR="$(echo $CLIXON_VERSION | awk -F "." '{print $1}')" +CLIXON_VERSION_MINOR="$(echo $CLIXON_VERSION | awk -F "." '{print $2}')" +CLIXON_VERSION_PATCH="$(echo $CLIXON_VERSION | awk -F "." '{print $3}' | awk -F " " '{print $1}')" # Debug flag AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[Build with debug symbols, default: no]),[ @@ -88,6 +89,7 @@ AC_CANONICAL_TARGET AC_SUBST(CLIXON_VERSION) AC_SUBST(CLIXON_VERSION_MAJOR) AC_SUBST(CLIXON_VERSION_MINOR) +AC_SUBST(CLIXON_VERSION_PATCH) AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION})