cleanup last changeset

bk: 4cf49d7d5aWNmrLPEeXImNcWBWbQxA

diff --git a/configure.ac b/configure.ac
index 36b13698bcc412b1988733a9526774e3c08b8a0b..037dff9a6a793058dc906d42596aa8ee78e64ead 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1549,7 +1549,8 @@ AC_CACHE_CHECK(
      no)
        ntp_cv_getsockname_socklen_type='socklen_t'
     esac
-    AS_UNSET([getsockname_arg2 getsockname_socklen_type_found])
+    AS_UNSET([getsockname_arg2])
+    AS_UNSET([getsockname_socklen_type_found])
     ]
 )
 AC_DEFINE_UNQUOTED([GETSOCKNAME_SOCKLEN_TYPE],

diff --git a/m4/ntp_cacheversion.m4 b/m4/ntp_cacheversion.m4
index f168068caa33c27133d07d89ca824b2eb2b458e1..bf27b89130d17ca6dedfb2bea21eeed4c52026ba 100644 (file)
--- a/m4/ntp_cacheversion.m4
+++ b/m4/ntp_cacheversion.m4
@@ -104,7 +104,9 @@ AC_DEFUN_ONCE([NTP_CACHEVERSION], [
        AC_MSG_NOTICE([[$cache_file saved by another version, ignored.]])
        AC_MSG_NOTICE([[configure script cache version: ]][$2])
        AC_MSG_NOTICE([[$cache_file version: $c_version]])
-       AS_UNSET([c_varname_list c_varname c_version])
+       AS_UNSET([c_varname])
+       AS_UNSET([c_varname_list])
+       AS_UNSET([c_version])
     esac
 
     AS_UNSET([ntp_cache_flush])

diff --git a/m4/ntp_lineeditlibs.m4 b/m4/ntp_lineeditlibs.m4
index 783e6df93c085dbe9a0613a50719d1f2a3845b7b..2a973e951fa75e04a1013ed9ca58245b7a2ca735 100644 (file)
--- a/m4/ntp_lineeditlibs.m4
+++ b/m4/ntp_lineeditlibs.m4
@@ -103,5 +103,8 @@ AC_DEFUN([NTP_LINEEDITLIBS], [
                [Define if your readline library has \`add_history'])
        esac
     esac       # $ntp_lib_lineedit
-    AS_UNSET([NTP_ORIG_LIBS TRY_LIB use_lineeditlibs])
+    AS_UNSET([NTP_ORIG_LIBS])
+    AS_UNSET([ORIG_LIBS])
+    AS_UNSET([TRY_LIB])
+    AS_UNSET([use_lineeditlibs])
 ])dnl

diff --git a/sntp/configure.ac b/sntp/configure.ac
index c50d0ff271401c3db439c8c0652e669d58a5ea22..0b34eed7c5a71936fe2c8642c58b7396779890d0 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -310,7 +310,8 @@ AC_CACHE_CHECK(
      no)
        ntp_cv_getsockname_socklen_type='socklen_t'
     esac
-    AS_UNSET([getsockname_arg2 getsockname_socklen_type_found])
+    AS_UNSET([getsockname_arg2])
+    AS_UNSET([getsockname_socklen_type_found])
     ]
 )
 AC_DEFINE_UNQUOTED([GETSOCKNAME_SOCKLEN_TYPE],