diff --git a/config.h.in b/config.h.in
index 2c2fd922..d4151ac2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -9,8 +9,8 @@
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 
-/* Define to 1 if you have the `getaddrinfo' function. */
-#undef HAVE_GETADDRINFO
+/* Define to 1 if you have the `getaddrinfo,' function. */
+#undef HAVE_GETADDRINFO_
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
@@ -58,6 +58,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
 /* Define to 1 if you have the `strrchr' function. */
 #undef HAVE_STRRCHR
 
diff --git a/configure.in b/configure.in
index 468f975d..cf51e447 100644
--- a/configure.in
+++ b/configure.in
@@ -69,8 +69,7 @@ AC_TYPE_SSIZE_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([memset select socket strcasecmp strrchr getaddrinfo])
-AC_SEARCH_LIBS(strnlen, c)
+AC_CHECK_FUNCS([memset select socket strcasecmp strrchr getaddrinfo, strnlen])
 
 AC_CONFIG_HEADERS([config.h])