diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-07-09 21:56:42 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-07-09 21:56:42 +0000 |
| commit | a9d9ea10824f91abe53631979f59c81a278f20ce (patch) | |
| tree | 4184a91d60c954d050d44efc644055981b6f074c /usr.sbin/nsd/configure.ac | |
| parent | 130a57e86d74176856336513144c7519bbac35c4 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/configure.ac')
| -rw-r--r-- | usr.sbin/nsd/configure.ac | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/usr.sbin/nsd/configure.ac b/usr.sbin/nsd/configure.ac index d0bc1711f13..8e6c80de54e 100644 --- a/usr.sbin/nsd/configure.ac +++ b/usr.sbin/nsd/configure.ac @@ -4,7 +4,7 @@ dnl sinclude(acx_nlnetlabs.m4) -AC_INIT(NSD,3.2.10,nsd-bugs@nlnetlabs.nl) +AC_INIT(NSD,3.2.11,nsd-bugs@nlnetlabs.nl) AC_CONFIG_HEADER([config.h]) AC_AIX @@ -640,6 +640,21 @@ case "$enable_mmap" in ;; esac +# +# Default zonestatsfile +# +zonestatsfile=${localstatedir}/log/nsd.stats +AC_SUBST(zonestatsfile) +AC_DEFINE_UNQUOTED(ZONESTATSFILE, ["`eval echo $zonestatsfile`"], [Pathname to the NSD statistics file]) +AC_ARG_ENABLE(zone_stats, AC_HELP_STRING([--enable-zone-stats], [Maintain statistics per zone, instead of global statistics.])) +case "$enable_zone_stats" in + yes) + AC_DEFINE_UNQUOTED([USE_ZONE_STATS], [], [Define this to enable zone statistics.]) + ;; + no|*) + ;; +esac + AH_BOTTOM([ /* define before includes as it specifies what standard to use. */ #if (defined(HAVE_PSELECT) && !defined (HAVE_PSELECT_PROTO)) \ @@ -812,14 +827,26 @@ AH_BOTTOM([ # big fat warning if test "$enable_checking" = "yes"; then - echo "************************************************" - echo "* You have activated \"--enable-checking\" *" - echo "* *" - echo "* This will instruct NSD to be stricter *" - echo "* when validating its input. This could lead *" - echo "* to a reduced service level. *" - echo "* *" - echo "************************************************" + echo "*************************************************" + echo "* You have activated \"--enable-checking\" *" + echo "* *" + echo "* This will instruct NSD to be stricter *" + echo "* when validating its input. This could lead *" + echo "* to a reduced service level. *" + echo "* *" + echo "*************************************************" +fi + +if test "$enable_zone_stats" = "yes"; then + echo "*************************************************" + echo "* You have activated \"--enable-zone-stats\" *" + echo "* *" + echo "* This will make NSD maintain statistics *" + echo "* on a per zone basis. This could lead to *" + echo "* a reduced service level and an *" + echo "* a larger memory footprint. *" + echo "* *" + echo "*************************************************" fi AC_CONFIG_FILES([Makefile]) |