Catch up with r819 for cmake.

SVN-Revision: 821

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59b5a94c5acf0032d9d0e4cb1b49f6cd004709a2..061fee7e45d1105a7c41597ce1126ef61b55e686 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -468,6 +468,9 @@ IF(NOT HAVE_UINTMAX_T)
 ENDIF(NOT HAVE_UINTMAX_T)
 #
 CHECK_TYPE_SIZE(wchar_t     SIZEOF_WCHAR_T)
+IF(HAVE_SIZEOF_WCHAR_T)
+  SET(HAVE_WCHAR_T 1)
+ENDIF(HAVE_SIZEOF_WCHAR_T)
 #
 # Check if _FILE_OFFSET_BITS macro needed for large files
 #

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 8832b8ffc88e985ae08d90e5dbc5a61bc184fbdc..9048f9df3c55fa56a93835f74b6b2a97c5c57c1a 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -515,6 +515,9 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #cmakedefine HAVE_WCHAR_H 1
 
+/* Define to 1 if the system has the type `wchar_t'. */
+#cmakedefine HAVE_WCHAR_T 1
+
 /* Define to 1 if you have the `wcscpy' function. */
 #cmakedefine HAVE_WCSCPY 1
 
@@ -587,6 +590,9 @@
 /* Define to the updates SHA1 context function. */
 #cmakedefine SHA1_Update ${SHA1_Update}
 
+/* The size of `wchar_t', as computed by sizeof. */
+#cmakedefine SIZEOF_WCHAR_T ${SIZEOF_WCHAR_T}
+
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS 1