A bunch of conversion to docstring.

[lyx.git] / development / cmake / config.h.cmake

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 0f38b944c4b904924ab6f8cf2d70c13f671a7ba4..4fd101b168281bd790ba1b0d91d39d763199413b 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -63,7 +63,6 @@
 #cmakedefine HAVE_STRCASECMP 1
 #cmakedefine HAVE_STRDUP 1
 #cmakedefine HAVE_STRTOUL 1
-#cmakedefine HAVE_ALLOCA 1
 #cmakedefine HAVE___FSETLOCKING 1
 #cmakedefine HAVE_MEMPCPY 1
 #cmakedefine HAVE___ARGZ_COUNT 1
@@ -85,9 +84,21 @@
 #cmakedefine HAVE_SSTREAM 1
 #cmakedefine HAVE_ARGZ_H 1
 
+#cmakedefine HAVE_ALLOCA 1
+#cmakedefine HAVE_SYMBOL_ALLOCA 1
+#if defined(HAVE_SYMBOL_ALLOCA) && !defined(HAVE_ALLOCA)
+#define HAVE_ALLOCA
+#endif
+
 #cmakedefine HAVE_ASPELL_ASPELL_H 1
 #cmakedefine HAVE_ASPELL_H 1
 
+#cmakedefine HAVE_ICONV_CONST 1
+#ifdef HAVE_ICONV_CONST
+#define ICONV_CONST const
+#else
+#define ICONV_CONST
+#endif
 
 #cmakedefine PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION ${PACKAGE_VERSION}
@@ -121,7 +132,6 @@
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 
 #define BOOST_DISABLE_THREADS 1
-#define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__