upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- configure is set to 1.14.0, and release branch.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-12-01 10:08:54 +01:00
parent 31bac7d5ca
commit 5d63ad6474
3 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for unbound 1.13.3. # Generated by GNU Autoconf 2.69 for unbound 1.14.0.
# #
# Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>. # Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>.
# #
@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='unbound' PACKAGE_NAME='unbound'
PACKAGE_TARNAME='unbound' PACKAGE_TARNAME='unbound'
PACKAGE_VERSION='1.13.3' PACKAGE_VERSION='1.14.0'
PACKAGE_STRING='unbound 1.13.3' PACKAGE_STRING='unbound 1.14.0'
PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues'
PACKAGE_URL='' PACKAGE_URL=''
@ -698,6 +698,7 @@ swig
SWIG_LIB SWIG_LIB
SWIG SWIG
PC_PY_DEPENDENCY PC_PY_DEPENDENCY
PYTHON_LIBS
PY_MAJOR_VERSION PY_MAJOR_VERSION
PYTHON_SITE_PKG PYTHON_SITE_PKG
PYTHON_LDFLAGS PYTHON_LDFLAGS
@ -1465,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures unbound 1.13.3 to adapt to many kinds of systems. \`configure' configures unbound 1.14.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1530,7 +1531,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of unbound 1.13.3:";; short | recursive ) echo "Configuration of unbound 1.14.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1772,7 +1773,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
unbound configure 1.13.3 unbound configure 1.14.0
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2481,7 +2482,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by unbound $as_me 1.13.3, which was It was created by unbound $as_me 1.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -2831,9 +2832,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MAJOR=1
UNBOUND_VERSION_MINOR=13 UNBOUND_VERSION_MINOR=14
UNBOUND_VERSION_MICRO=3 UNBOUND_VERSION_MICRO=0
LIBUNBOUND_CURRENT=9 LIBUNBOUND_CURRENT=9
@ -2918,7 +2919,7 @@ LIBUNBOUND_AGE=1
# 1.13.0 had 9:11:1 # 1.13.0 had 9:11:1
# 1.13.1 had 9:12:1 # 1.13.1 had 9:12:1
# 1.13.2 had 9:13:1 # 1.13.2 had 9:13:1
# 1.13.3 had 9:14:1 # 1.14.0 had 9:14:1
# Current -- the number of the binary API that we're implementing # Current -- the number of the binary API that we're implementing
# Revision -- which iteration of the implementation of the binary # Revision -- which iteration of the implementation of the binary
@ -17555,11 +17556,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
$as_echo "#define HAVE_PYTHON 1" >>confdefs.h $as_echo "#define HAVE_PYTHON 1" >>confdefs.h
if test -n "$LIBS"; then if test x_$ub_with_pythonmod != x_no; then
LIBS="$PYTHON_LDFLAGS $LIBS" if test -n "$LIBS"; then
else LIBS="$PYTHON_LDFLAGS $LIBS"
LIBS="$PYTHON_LDFLAGS" else
LIBS="$PYTHON_LDFLAGS"
fi
fi fi
PYTHON_LIBS="$PYTHON_LDFLAGS"
if test -n "$CPPFLAGS"; then if test -n "$CPPFLAGS"; then
CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
else else
@ -18347,7 +18352,7 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
SSLLIB="-lssl" SSLLIB="-lssl"
PC_CRYPTO_DEPENDENCY="libcrypto libssl" PC_CRYPTO_DEPENDENCY=""
# check if -lcrypt32 is needed because CAPIENG needs that. (on windows) # check if -lcrypt32 is needed because CAPIENG needs that. (on windows)
@ -20417,7 +20422,7 @@ if test "$ac_res" != no; then :
fi fi
for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 getifaddrs for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 getifaddrs if_nametoindex
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@ -21730,12 +21735,6 @@ if test "${with_libunbound_only+set}" = set; then :
INSTALLTARGET="install-lib" INSTALLTARGET="install-lib"
fi fi
fi
ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
if test "x$ac_cv_func_if_nametoindex" = xyes
then :
printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
fi fi
if test $ALLTARGET = "alltargets"; then if test $ALLTARGET = "alltargets"; then
@ -21841,7 +21840,7 @@ _ACEOF
version=1.13.3 version=1.14.0
date=`date +'%b %e, %Y'` date=`date +'%b %e, %Y'`
@ -22360,7 +22359,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by unbound $as_me 1.13.3, which was This file was extended by unbound $as_me 1.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -22426,7 +22425,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
unbound config.status 1.13.3 unbound config.status 1.14.0
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

6
configure.ac
View file

@ -10,8 +10,8 @@ sinclude(dnscrypt/dnscrypt.m4)
# must be numbers. ac_defun because of later processing # must be numbers. ac_defun because of later processing
m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MAJOR],[1])
m4_define([VERSION_MINOR],[13]) m4_define([VERSION_MINOR],[14])
m4_define([VERSION_MICRO],[3]) m4_define([VERSION_MICRO],[0])
AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound])
AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
@ -99,7 +99,7 @@ LIBUNBOUND_AGE=1
# 1.13.0 had 9:11:1 # 1.13.0 had 9:11:1
# 1.13.1 had 9:12:1 # 1.13.1 had 9:12:1
# 1.13.2 had 9:13:1 # 1.13.2 had 9:13:1
# 1.13.3 had 9:14:1 # 1.14.0 had 9:14:1
# Current -- the number of the binary API that we're implementing # Current -- the number of the binary API that we're implementing
# Revision -- which iteration of the implementation of the binary # Revision -- which iteration of the implementation of the binary

3
doc/Changelog
View file

@ -1,3 +1,6 @@
1 December 2021: Wouter
- configure is set to 1.14.0, and release branch.
1 December 2021: George 1 December 2021: George
- Merge PR #511 from yan12125: Reduce unnecessary linking. - Merge PR #511 from yan12125: Reduce unnecessary linking.
- Merge PR #493 from Jaap: Fix generation of libunbound.pc. - Merge PR #493 from Jaap: Fix generation of libunbound.pc.