diff --git a/configure.in b/configure.in
index b2fb2c6efdb1..f0d96f0a587e 100644
--- a/configure.in
+++ b/configure.in
@@ -1594,9 +1594,13 @@ dnl ========================================================
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(random strerror lchown fchmod snprintf localtime_r statvfs memmove rint)
-AC_CHECK_FUNCS(nl_langinfo strtok_r)
+AC_CHECK_FUNCS(nl_langinfo)
 
 AC_LANG_CPLUSPLUS
+
+dnl Do the check for strtok_r since HP 10.20 has it in C but not C++.
+AC_CHECK_FUNCS(strtok_r)
+
 AC_CACHE_CHECK(
     [for gnu_get_libc_version()],
     ac_cv_func_gnu_get_libc_version,