summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorAndrei Pavel <andrei@isc.org>2024-04-23 18:57:05 +0200
committerAndrei Pavel <andrei@isc.org>2024-04-24 14:23:48 +0200
commit677f8a8f0e4659b3a1ad2e4b1db8e6c0c6b6ee00 (patch)
treec3e4d90051f4a4b567de05f9cce669c2e7bc3a67 /configure.ac
parent[#3254] show premium source in extended version (diff)
downloadkea-677f8a8f0e4659b3a1ad2e4b1db8e6c0c6b6ee00.tar.xz
kea-677f8a8f0e4659b3a1ad2e4b1db8e6c0c6b6ee00.zip
[#3254] consistent version output across executables
- replace VERSION with PACKAGE_VERSION in src/bin/admin to avoid overlap with VERSION used in src/share/database. - add -V to kea-admin - add -V to kea-shell - add -V to keactrl - add -V to perfdhcp - removed getVersionAddendum from d2 and added the openssl version to the output of other process versions since it's not only used by d2 - make all -V outputs consistent. Some are showing only core version and are missing premium version which is fine since they are the executables that don't have something to do with premium directly anyway.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index c7ad92d8c9..f25058c8ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ else
AC_MSG_RESULT("tarball")
fi
-# Export KEA_SRCID to config.h
+# Export KEA_SRCID to a C++ header.
# This will be either package version or "tarball" or "git abcd".
# We do not want to put this in a config.h, because it messes up ccache
# horribly. When building different branches, the commit-id is different
@@ -1823,16 +1823,13 @@ AC_CONFIG_FILES([tools/path_replacer.sh],
AC_CONFIG_FILES([tools/extract_bnf.sh],
[chmod +x tools/extract_bnf.sh])
-
-AC_OUTPUT
-
-dnl Print the results
-dnl
-
EXTENDED_VERSION=${PACKAGE_VERSION}
if test "$KEA_SRCID" != ""; then
EXTENDED_VERSION="${EXTENDED_VERSION} ($KEA_SRCID)"
fi
+AC_SUBST(EXTENDED_VERSION)
+
+AC_OUTPUT
# By default the following variables are defined:
# - prefix = /usr/local
@@ -1850,6 +1847,7 @@ fi
libdir_real="$(eval echo ${libdir})"
libdir_real="$(eval echo ${libdir_real})"
+# Print the report.
cat > config.report << END
Kea source configure results: