From 1a34a553833fe019f975129d194cc770997e00d3 Mon Sep 17 00:00:00 2001
From: Luis Diaz Mas <piponazo@gmail.com>
Date: Mon, 31 Jul 2017 18:36:01 +0200
Subject: [PATCH] Handle HAVE_STRINGS_H variable in the new cmake file

---
 config/CMakeChecks.txt          | 6 +-----
 config/config.h.cmake           | 7 ++-----
 config/config.h.in              | 3 ---
 config/generateConfigFile.cmake | 1 +
 include/exiv2/exv_msvc.h        | 3 ---
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index 4780ab97..36ecc467 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -70,8 +70,6 @@ ENDIF( EXIV2_ENABLE_COMMERCIAL )
 
 # checking for Header files
 check_include_file( "inttypes.h" have_inttypes_h )
-check_include_file( "string.h" HAVE_STRING_H )
-check_include_file( "strings.h" HAVE_STRINGS_H )
 check_include_file( "wchar.h" HAVE_WCHAR_H )
 check_include_file( "sys/stat.h" HAVE_SYS_STAT_H )
 check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
@@ -105,9 +103,7 @@ IF( NOT MSVC )
     SET( HAVE_PID_T TRUE )
 ENDIF( NOT MSVC )
 
-SET( EXV_SYMBOLS HAVE_STRINGS_H
-                 HAVE_STRING_H
-                 HAVE_STRTOL
+SET( EXV_SYMBOLS HAVE_STRTOL
                  HAVE_SYS_MMAN_H
                  HAVE_SYS_STAT_H
                  HAVE_SYS_TIME_H
diff --git a/config/config.h.cmake b/config/config.h.cmake
index e042313a..531cce63 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -86,11 +86,8 @@
 // Definition to indicate if strerror_r returns char *.
 #cmakedefine STRERROR_R_CHAR_P
 
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine EXV_HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine EXV_HAVE_STRING_H 1
+// Definition to indicate if you have the <strings.h> header file.
+#cmakedefine EXV_HAVE_STRINGS_H
 
 /* Define to 1 if you have the `strtol' function. */
 #cmakedefine EXV_HAVE_STRTOL 1
diff --git a/config/config.h.in b/config/config.h.in
index 00d3c7f7..6ade30c7 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -80,9 +80,6 @@
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake
index 965610e0..cdae47b0 100644
--- a/config/generateConfigFile.cmake
+++ b/config/generateConfigFile.cmake
@@ -34,6 +34,7 @@ check_include_file( "process.h" EXV_HAVE_PROCESS_H )
 check_include_file( "stdbool.h" EXV_HAVE_STDBOOL_H )
 check_include_file( "stdint.h"  EXV_HAVE_STDINT_H )
 check_include_file( "stdlib.h"  EXV_HAVE_STDLIB_H )
+check_include_file( "strings.h" EXV_HAVE_STRINGS_H )
 
 if (NOT EXV_HAVE_LIBINTL_H)
     set(EXV_ENABLE_NLS 0)
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 155fa0dc..a911704e 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -89,9 +89,6 @@
 /* Define to 1 if you have the <strings.h> header file. */
 /* #undef EXV_HAVE_STRINGS_H */
 
-/* Define to 1 if you have the <string.h> header file. */
-/* #undef EXV_HAVE_STRING_H */
-
 /* Define to 1 if you have the `strtol' function. */
 #define EXV_HAVE_STRTOL 1