clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 06:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix for #570: regen aclocal.m4, fix configure.ac for spelling.

Browse Source
This commit is contained in:
W.C.A. Wijngaards 2021-11-29 11:41:45 +01:00
parent 9645228f03
commit 22881e28cc
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aclocal.m4 vendored
View File

@ -622,7 +622,7 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT # LT_OUTPUT
# --------- # ---------
# This macro allows early generation of the libtool script (before # This macro allows early generation of the libtool script (before
# AC_OUTPUT is called), in case it is used in configure for compilation # AC_OUTPUT is called), incase it is used in configure for compilation
# tests. # tests.
AC_DEFUN([LT_OUTPUT], AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt} [: ${CONFIG_LT=./config.lt}
@ -659,7 +659,7 @@ configured by $[0], generated by m4_PACKAGE_STRING.
Copyright (C) 2011 Free Software Foundation, Inc. Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation This config.lt script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it." gives unlimited permision to copy, distribute and modify it."
while test 0 != $[#] while test 0 != $[#]
do do
@ -2876,7 +2876,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# Add ABI-specific directories to the system library path. # Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Ideally, we could use ldconfig to report *all* directories which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command # being certain /sbin/ldconfig is available, command
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
@ -9132,7 +9132,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
dnl only at the first occurrence in configure.ac, so if the first place dnl only at the first occurence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS], AC_DEFUN([PKG_CHECK_EXISTS],

2
configure vendored
View File

@ -13600,7 +13600,7 @@ fi
# Add ABI-specific directories to the system library path. # Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Ideally, we could use ldconfig to report *all* directories which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command # being certain /sbin/ldconfig is available, command
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,

4
configure.ac
View File

@ -458,7 +458,7 @@ AC_SUBST(RUNTIME_PATH)
AC_SEARCH_LIBS([inet_pton], [nsl]) AC_SEARCH_LIBS([inet_pton], [nsl])
AC_SEARCH_LIBS([socket], [socket]) AC_SEARCH_LIBS([socket], [socket])
# check wether strptime also works # check whether strptime also works
AC_DEFUN([AC_CHECK_STRPTIME_WORKS], AC_DEFUN([AC_CHECK_STRPTIME_WORKS],
[AC_REQUIRE([AC_PROG_CC]) [AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING(whether strptime works) AC_MSG_CHECKING(whether strptime works)
@ -980,7 +980,7 @@ case "$enable_subnet" in
;; ;;
esac esac
# check wether gost also works # check whether gost also works
AC_DEFUN([AC_CHECK_GOST_WORKS], AC_DEFUN([AC_CHECK_GOST_WORKS],
[AC_REQUIRE([AC_PROG_CC]) [AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING([if GOST works]) AC_MSG_CHECKING([if GOST works])

4
doc/Changelog
View File

@ -1,3 +1,7 @@
29 November 2021: Wouter
- Merge PR #570 from rex4539: Fix typos.
- Fix for #570: regen aclocal.m4, fix configure.ac for spelling.
15 November 2021: Tom 15 November 2021: Tom
- Improve EDNS option handling, now also works for synthesised - Improve EDNS option handling, now also works for synthesised
responses such as local-data and server.id CH TXT responses. responses such as local-data and server.id CH TXT responses.