Handle HAVE_REGEX in the new cmake file

config/CMakeChecks.txt

@@ -70,7 +70,6 @@ ENDIF( EXIV2_ENABLE_COMMERCIAL )
 
 # checking for Header files
 check_include_file( "inttypes.h" have_inttypes_h )
-check_include_file( "regex.h" HAVE_REGEX )
 
 # time.h and sys/time.h can be included in the same file
 CHECK_C_SOURCE_COMPILES( "#include <time.h>
@@ -84,9 +83,7 @@ IF( NOT MSVC )
     SET( HAVE_PID_T TRUE )
 ENDIF( NOT MSVC )
 
-SET( EXV_SYMBOLS HAVE_XMP_TOOLKIT
-                 HAVE_REGEX
-                 UNICODE_PATH
+SET( EXV_SYMBOLS UNICODE_PATH
    )
 
 FOREACH( entry ${EXV_SYMBOLS} )

config/config.h.cmake

@@ -50,8 +50,8 @@
 #define EXV_ICONV_CONST
 #endif
 
-/* Define to 1 if you have the <regex.h> header file. */
-#cmakedefine EXV_HAVE_REGEX 1
+// Definition to indicate if you have the <regex.h> header file.
+#cmakedefine EXV_HAVE_REGEX
 
 // Definition to indicate you have the <memory.h> header file.
 #cmakedefine EXV_HAVE_MEMORY_H

config/generateConfigFile.cmake

@@ -40,6 +40,7 @@ check_include_file( "strings.h" EXV_HAVE_STRINGS_H )
 check_include_file( "sys/mman.h"    EXV_HAVE_SYS_MMAN_H )
 check_include_file( "sys/stat.h"    EXV_HAVE_SYS_STAT_H )
 check_include_file( "sys/types.h"   EXV_HAVE_SYS_TYPES_H )
+check_include_file( "regex.h"       EXV_HAVE_REGEX )
 
 if (NOT EXV_HAVE_LIBINTL_H)
     set(EXV_ENABLE_NLS 0)