diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-08-28 15:15:03 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-08-28 15:15:03 +0000 |
| commit | 7e1cf578732c039eb8282062ee1b0694b8999fd9 (patch) | |
| tree | 89a3d25bc8a47448844099059dbe311d68ea7376 /usr.sbin/nsd/configure | |
| parent | 0d6801061e70a4e5b4c14fb0f5922c5dbadb8c2d (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/configure')
| -rw-r--r-- | usr.sbin/nsd/configure | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure index a7afb0dcd76..dc4edae718b 100644 --- a/usr.sbin/nsd/configure +++ b/usr.sbin/nsd/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for NSD 3.2.11. +# Generated by GNU Autoconf 2.68 for NSD 3.2.13. # # Report bugs to <nsd-bugs@nlnetlabs.nl>. # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NSD' PACKAGE_TARNAME='nsd' -PACKAGE_VERSION='3.2.11' -PACKAGE_STRING='NSD 3.2.11' +PACKAGE_VERSION='3.2.13' +PACKAGE_STRING='NSD 3.2.13' PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NSD 3.2.11 to adapt to many kinds of systems. +\`configure' configures NSD 3.2.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NSD 3.2.11:";; + short | recursive ) echo "Configuration of NSD 3.2.13:";; esac cat <<\_ACEOF @@ -1447,7 +1447,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NSD configure 3.2.11 +NSD configure 3.2.13 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1927,7 +1927,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NSD $as_me 3.2.11, which was +It was created by NSD $as_me 3.2.13, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -8162,7 +8162,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NSD $as_me 3.2.11, which was +This file was extended by NSD $as_me 3.2.13, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8224,7 +8224,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NSD config.status 3.2.11 +NSD config.status 3.2.13 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |