diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-03-02 08:40:59 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-03-02 08:40:59 +0000 |
| commit | 6c0aec60ca28a4193cdabdbbf6e4f107d2091d7e (patch) | |
| tree | 06cc1d287a3f04b72628922d35040091a3d7b07b /usr.sbin/nsd/configure | |
| parent | 7fc349b740f993e7c0dcdc03904b7d1eaf85d260 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/configure')
| -rw-r--r-- | usr.sbin/nsd/configure | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure index 10dd42e6a19..fc6a8672d5c 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.9. +# Generated by GNU Autoconf 2.68 for NSD 3.2.10. # # 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.9' -PACKAGE_STRING='NSD 3.2.9' +PACKAGE_VERSION='3.2.10' +PACKAGE_STRING='NSD 3.2.10' PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1256,7 +1256,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.9 to adapt to many kinds of systems. +\`configure' configures NSD 3.2.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1317,7 +1317,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NSD 3.2.9:";; + short | recursive ) echo "Configuration of NSD 3.2.10:";; esac cat <<\_ACEOF @@ -1443,7 +1443,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NSD configure 3.2.9 +NSD configure 3.2.10 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1923,7 +1923,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.9, which was +It was created by NSD $as_me 3.2.10, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -5264,7 +5264,7 @@ else cat >conftest.c <<EOF #include <time.h> -void testing (void) { struct tm t; char *timestr; strptime(timestr, "%Y%m", &t); } +int testing (void) { struct tm t; const char *timestr="201201"; return strptime(timestr, "%Y%m", &t)!=0; } EOF if test -z "`$CC -Wall -Werror -c conftest.c 2>&1`"; then eval "ac_cv_c_strptime_needs_defs=no" @@ -8119,7 +8119,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.9, which was +This file was extended by NSD $as_me 3.2.10, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8181,7 +8181,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.9 +NSD config.status 3.2.10 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |