Commit 53a4e185 authored by Curtis Blackburn's avatar Curtis Blackburn

3509. [cleanup] Added a product line to version file to allow for

                        easy naming of different products (BIND
                        vs BIND ESV, for example). [RT #32755]
parent f9de007a
3509. [cleanup] Added a product line to version file to allow for
easy naming of different products (BIND
vs BIND ESV, for example). [RT #32755]
3508. [contrib] queryperf was incorrectly rejecting the -T option.
[RT #32338]
......
......@@ -21,6 +21,8 @@ top_srcdir = @top_srcdir@
@BIND9_VERSION@
@BIND9_PRODUCT@
@BIND9_SRCID@
@BIND9_CONFIGARGS@
......@@ -120,6 +122,7 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
main.@O@: main.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-DVERSION=\"${VERSION}\" \
-DPRODUCT=\"${PRODUCT}\" \
-DSRCID=\"${SRCID}\" \
-DCONFIGARGS="\"${CONFIGARGS}\"" \
-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
......
......@@ -68,6 +68,7 @@ EXTERN isc_timermgr_t * ns_g_timermgr INIT(NULL);
EXTERN isc_socketmgr_t * ns_g_socketmgr INIT(NULL);
EXTERN cfg_parser_t * ns_g_parser INIT(NULL);
EXTERN const char * ns_g_version INIT(VERSION);
EXTERN const char * ns_g_product INIT(PRODUCT);
EXTERN const char * ns_g_srcid INIT(SRCID);
EXTERN const char * ns_g_configargs INIT(CONFIGARGS);
EXTERN in_port_t ns_g_port INIT(0);
......
......@@ -552,10 +552,10 @@ parse_command_line(int argc, char *argv[]) {
ns_g_username = isc_commandline_argument;
break;
case 'v':
printf("BIND %s\n", ns_g_version);
printf("%s %s\n", ns_g_product, ns_g_version);
exit(0);
case 'V':
printf("BIND %s <id:%s> built with %s\n",
printf("%s %s <id:%s> built with %s\n", ns_g_product,
ns_g_version, ns_g_srcid, ns_g_configargs);
#ifdef OPENSSL
printf("using OpenSSL version: %s\n",
......@@ -820,8 +820,8 @@ setup(void) {
isc_result_totext(result));
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
saved_command_line);
ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product,
ns_g_version, saved_command_line);
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "built with %s", ns_g_configargs);
......
......@@ -1170,6 +1170,7 @@ BIND9_CONFIGARGS
BIND9_SRCID
BIND9_MAJOR
BIND9_VERSION
BIND9_PRODUCT
BIND9_BIND9_BUILDINCLUDE
BIND9_LWRES_BUILDINCLUDE
BIND9_DNS_BUILDINCLUDE
......@@ -19770,6 +19771,8 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
. $srcdir/version
BIND9_PRODUCT="PRODUCT=${PRODUCT}"
BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
......
......@@ -3425,6 +3425,8 @@ AC_SUBST_FILE(BIND9_MAKE_RULES)
BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
. $srcdir/version
BIND9_PRODUCT="PRODUCT=${PRODUCT}"
AC_SUBST(BIND9_PRODUCT)
BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
AC_SUBST(BIND9_VERSION)
BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
......
......@@ -3,6 +3,7 @@
# This file must follow /bin/sh rules. It is imported directly via
# configure.
#
PRODUCT=BIND
MAJORVER=9
MINORVER=10
PATCHVER=0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment