X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FconfigCompiler.h.cmake;h=858cfc971144f5ff4baf38b32bcfd3b50d33c737;hb=90f723e2829a73d334ea3d5d59b71a6bf8e769ad;hp=a35f5b3137b07e657b8c190198790064b5b4c242;hpb=f494131d061a8f9638b74f04f5043ce59eb5f328;p=lyx.git

diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index a35f5b3137..858cfc9711 100644
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * This is the compilation configuration file for LyX.
- * It was generated by autoconfs configure.
+ * It was generated by cmake.
  * You might want to change some of the defaults if something goes wrong
  * during the compilation.
  */
@@ -13,66 +13,23 @@
 #define _CONFIG_COMPILER_H
 
 
-#cmakedefine HAVE_LIMITS_H 1
-#cmakedefine HAVE_LOCALE_H 1
-#cmakedefine HAVE_STDLIB_H 1
-#cmakedefine HAVE_SYS_STAT_H 1
-#cmakedefine HAVE_SYS_TIME_H 1
-#cmakedefine HAVE_SYS_TYPES_H 1
-#cmakedefine HAVE_SYS_UTIME_H 1
-#cmakedefine HAVE_SYS_SOCKET_H 1
-#cmakedefine HAVE_UNISTD_H 1
-#cmakedefine HAVE_INTTYPES_H 1
-#cmakedefine HAVE_UTIME_H 1
-#cmakedefine HAVE_STRING_H 1
 #cmakedefine HAVE_ISTREAM 1
 #cmakedefine HAVE_OSTREAM 1
 #cmakedefine HAVE_IOS 1
 #cmakedefine HAVE_LOCALE 1
-#cmakedefine HAVE_OPEN 1
-#cmakedefine HAVE_CHMOD 1
-#cmakedefine HAVE_CLOSE 1
-#cmakedefine HAVE_DCGETTEXT 1
-#cmakedefine HAVE_POPEN 1
-#cmakedefine HAVE_PCLOSE 1
-#cmakedefine HAVE__OPEN 1
-#cmakedefine HAVE__CLOSE 1
-#cmakedefine HAVE__POPEN 1
-#cmakedefine HAVE__PCLOSE 1
-#cmakedefine HAVE_GETPID 1
-#cmakedefine HAVE__GETPID 1
-#cmakedefine HAVE_GETTEXT 1
-#cmakedefine HAVE_MKDIR 1
-#cmakedefine HAVE__MKDIR 1
-#cmakedefine HAVE_PUTENV 1
-#cmakedefine HAVE_SETENV 1
-#cmakedefine HAVE_STRERROR 1
+
+#include "configIncludes.h"
+
+#include "configFunctions.h"
+
 #cmakedefine HAVE_STD_COUNT 1
 #cmakedefine HAVE_ASPRINTF 1
 #cmakedefine HAVE_WPRINTF 1
 #cmakedefine HAVE_SNPRINTF 1
 #cmakedefine HAVE_POSIX_PRINTF 1
-#cmakedefine HAVE_FCNTL 1
 #cmakedefine HAVE_INTMAX_T 1
 #cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1
 #cmakedefine CXX_GLOBAL_CSTD 1
-#cmakedefine HAVE_GETCWD 1
-#cmakedefine HAVE_STPCPY 1
-#cmakedefine HAVE_STRCASECMP 1
-#cmakedefine HAVE_STRDUP 1
-#cmakedefine HAVE_STRTOUL 1
-#cmakedefine HAVE___FSETLOCKING 1
-#cmakedefine HAVE_MEMPCPY 1
-#cmakedefine HAVE___ARGZ_COUNT 1
-#cmakedefine HAVE___ARGZ_NEXT 1
-#cmakedefine HAVE___ARGZ_STRINGIFY 1
-#cmakedefine HAVE_SETLOCALE 1
-#cmakedefine HAVE_TSEARCH 1
-#cmakedefine HAVE_GETEGID 1
-#cmakedefine HAVE_GETGID 1
-#cmakedefine HAVE_GETUID 1
-#cmakedefine HAVE_WCSLEN 1
-#cmakedefine HAVE_MKFIFO 1
 #cmakedefine HAVE_WPRINTF 1
 #cmakedefine HAVE_LONG_DOUBLE 1
 #cmakedefine HAVE_LONG_LONG 1
@@ -82,6 +39,7 @@
 #cmakedefine HAVE_LC_MESSAGES 1    
 #cmakedefine HAVE_SSTREAM 1
 #cmakedefine HAVE_ARGZ_H 1
+#cmakedefine HAVE_MAGIC_H 1
 #cmakedefine SIZEOF_WCHAR_T_IS_2 1
 #cmakedefine SIZEOF_WCHAR_T_IS_4 1
 
@@ -135,7 +93,7 @@
 #endif
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 
-#define BOOST_DISABLE_THREADS 1
+//#define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
@@ -144,17 +102,7 @@
 #  define BOOST_POSIX_PATH 1
 #endif
 
-/*
- * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
- * support compiled in:
- * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
- * And we are not interested at all what libc
- * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
- * has the needed wchar_t support and uses UCS4. Whether it
- * implements this with the help of libc, or whether it has own code
- * does not matter for us, because we don't use libc directly (Georg)
-*/
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
 #  define USE_WCHAR_T
 #endif