diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index e1ccf63d..f048efc2 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -79,8 +79,6 @@ check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
 check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H )
 check_include_file( "regex.h" HAVE_REGEX )
 
-check_function_exists( strchr HAVE_STRCHR )
-check_function_exists( strchr_r HAVE_STRCHR_R )
 check_function_exists( strerror HAVE_STRERROR )
 check_function_exists( strerror_r HAVE_STRERROR_R )
 check_function_exists( strtol HAVE_STRTOL )
@@ -109,9 +107,7 @@ IF( NOT MSVC )
     SET( HAVE_PID_T TRUE )
 ENDIF( NOT MSVC )
 
-SET( EXV_SYMBOLS HAVE_STRCHR
-                 HAVE_STRCHR_R
-                 HAVE_STRERROR
+SET( EXV_SYMBOLS HAVE_STRERROR
                  HAVE_STRERROR_R
                  HAVE_STRINGS_H
                  HAVE_STRING_H
diff --git a/config/config.h.cmake b/config/config.h.cmake
index 46120edd..f55169c5 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -74,8 +74,8 @@
 // Definition to indicate if you have the <stdlib.h> header file.
 #cmakedefine EXV_HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strchr' function. */
-#cmakedefine EXV_HAVE_STRCHR 1
+// Definition to indicate if you have the `strchr' function.
+#cmakedefine EXV_HAVE_STRCHR
 
 /* Define to 1 if you have the `strerror' function. */
 #cmakedefine EXV_HAVE_STRERROR 1
diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake
index 750be284..bdeea36a 100644
--- a/config/generateConfigFile.cmake
+++ b/config/generateConfigFile.cmake
@@ -20,6 +20,7 @@ check_function_exists( gmtime_r EXV_HAVE_GMTIME_R )
 check_function_exists( memset   EXV_HAVE_MEMSET )
 check_function_exists( mmap     EXV_HAVE_MMAP )
 check_function_exists( munmap   EXV_HAVE_MUNMAP )
+check_function_exists( strchr   EXV_HAVE_STRCHR )
 
 # TODO: This check should be removed and rely on the check done in findDependencies.cmake
 check_include_file( "libintl.h" EXV_HAVE_LIBINTL_H )