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

diff --git a/aclocal.m4 b/aclocal.m4
index d62b482d030f461661f4ad7897ada7d9d99996d6..bf3c57e2fd9fcf0bacaea386ad64ccd74253903c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -622,7 +622,7 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 # LT_OUTPUT
 # ---------
 # 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.
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
@@ -659,7 +659,7 @@ configured by $[0], generated by m4_PACKAGE_STRING.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
 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 != $[#]
 do
@@ -2876,7 +2876,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   # Add ABI-specific directories to the system library path.
   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
   # being certain /sbin/ldconfig is available, command
   # '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
 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 have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],

diff --git a/configure b/configure
index 9131b348af3b2d4190e15a9e2c37dcdd96e6c23f..5ebb3de5715e0f1e5f73c8fd2a2340ed379d65e7 100755 (executable)
--- a/configure
+++ b/configure
@@ -13600,7 +13600,7 @@ fi
   # Add ABI-specific directories to the system library path.
   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
   # being certain /sbin/ldconfig is available, command
   # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,

diff --git a/configure.ac b/configure.ac
index 99d57c41215a1b6c59abf7d52e56f5383424c1cd..721f2c8bae271a93c90de157ef50637fe8b4b1fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -458,7 +458,7 @@ AC_SUBST(RUNTIME_PATH)
 AC_SEARCH_LIBS([inet_pton], [nsl])
 AC_SEARCH_LIBS([socket], [socket])
 
-# check wether strptime also works
+# check whether strptime also works
 AC_DEFUN([AC_CHECK_STRPTIME_WORKS],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING(whether strptime works)
@@ -980,7 +980,7 @@ case "$enable_subnet" in
        ;;
 esac
 
-# check wether gost also works
+# check whether gost also works
 AC_DEFUN([AC_CHECK_GOST_WORKS],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if GOST works])

diff --git a/doc/Changelog b/doc/Changelog
index daaa9621c1ca3c0cd417e7e27efd233d87e92738..daee68596fccb1072339d55541871cf6b4b96180 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -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
        - Improve EDNS option handling, now also works for synthesised
          responses such as local-data and server.id CH TXT responses.