From 1080c13f5d3979149c1950a1c46f45e2d4bd0dc8 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Wed, 30 May 2012 08:15:48 +0200 Subject: configure: Add --with-pkg-extra-version=VER for packagers/distributions. This change adds a --with-pkg-extra-version option to ./configure to allow packagers and distributions to fine tune the version displayed to the end user to assist in support. It is also very useful when reporting bugs on the official Quagga mailing lists. There are two ways of utilsing this functionality: a) ./configure --with-pkg-extra-version=-wmo1 b) EXTRAVERSION=-wmo1 ./configure The latter is a common way for many distributions to add extra version strings to signify their own patch level to a given package. Also, minor whitespace fix in configure summary. Signed-off-by: Joachim Nilsson Signed-off-by: Joachim Nilsson Signed-off-by: David Lamparter --- configure.ac | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 277bad55..0d6e6eff 100755 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,9 @@ AC_PROG_LIBTOOL dnl ---------------------- dnl Packages configuration dnl ---------------------- +AC_ARG_WITH(pkg-extra-version, + AS_HELP_STRING([--with-pkg-extra-version=VER], [add extra version field, for packagers/distributions]), + [EXTRAVERSION=$withval],) AC_ARG_ENABLE(vtysh, [ --enable-vtysh include integrated vty shell for Quagga]) AC_ARG_ENABLE(ipv6, @@ -382,6 +385,16 @@ esac AC_SUBST(MULTIPATH_NUM) +dnl ----------------------------------- +dnl Add extra version string to package +dnl name, string and version fields. +dnl ----------------------------------- +if test "x${EXTRAVERSION}" != "x" ; then + VERSION=${VERSION}${EXTRAVERSION} + PACKAGE_VERSION=${PACKAGE_VERSION}${EXTRAVERSION} + PACKAGE_STRING=${PACKAGE_STRING}${EXTRAVERSION} +fi + dnl ------------------------------------ dnl Check C keywords and standard types dnl ------------------------------------ @@ -1636,7 +1649,7 @@ echo " Quagga configuration -------------------- quagga version : ${PACKAGE_VERSION} -host operating system : ${host_os} +host operating system : ${host_os} source code location : ${srcdir} compiler : ${CC} compiler flags : ${CFLAGS} -- cgit v1.2.1