Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / development / cmake / ConfigureChecks.cmake

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index a10bfd2e0672e0c1168ccac4d5ef3804e17dcdab..289bccddfa5ebde9983ad2e4e68f58654261d679 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -12,7 +12,10 @@ include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
+include(MacroBoolTo01)
+include(TestBigEndian)
 
+test_big_endian(WORDS_BIGENDIAN)
 
 check_include_file_cxx(aspell.h HAVE_ASPELL_H)
 check_include_file_cxx(aspell/aspell.h HAVE_ASPELL_ASPELL_H)
@@ -22,10 +25,8 @@ check_include_file_cxx(aspell/aspell.h HAVE_ASPELL_ASPELL_H)
 #check_include_file_cxx(sstream HAVE_SSTREAM)
 #check_include_file_cxx(locale HAVE_LOCALE)
 
-check_include_files(io.h HAVE_IO_H)
 check_include_files(limits.h HAVE_LIMITS_H)
 check_include_files(locale.h HAVE_LOCALE_H)
-check_include_files(process.h HAVE_PROCESS_H)
 check_include_files(stdlib.h HAVE_STDLIB_H)
 check_include_files(sys/stat.h HAVE_SYS_STAT_H)
 check_include_files(sys/time.h HAVE_SYS_TIME_H)
@@ -36,13 +37,13 @@ check_include_files(unistd.h HAVE_UNISTD_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
 check_include_files(utime.h HAVE_UTIME_H)
 check_include_files(string.h HAVE_STRING_H)
-check_include_files(strings.h HAVE_STRINGS_H)
 check_include_files(argz.h HAVE_ARGZ_H)
 
 
 check_function_exists(open HAVE_OPEN)
 check_function_exists(chmod HAVE_CHMOD)
 check_function_exists(close HAVE_CLOSE)
+check_function_exists(dcgettext HAVE_DCGETTEXT)
 check_function_exists(popen HAVE_POPEN)
 check_function_exists(pclose HAVE_PCLOSE)
 check_function_exists(_open HAVE__OPEN)
@@ -50,12 +51,13 @@ check_function_exists(_close HAVE__CLOSE)
 check_function_exists(_popen HAVE__POPEN)
 check_function_exists(_pclose HAVE__PCLOSE)
 check_function_exists(getpid HAVE_GETPID)
+check_function_exists(gettext HAVE_GETTEXT)
 check_function_exists(_getpid HAVE__GETPID)
 check_function_exists(mkdir  HAVE_MKDIR)
 check_function_exists(_mkdir HAVE__MKDIR)
+check_function_exists(setenv HAVE_SETENV)
 check_function_exists(putenv HAVE_PUTENV)
-check_function_exists(mktemp HAVE_MKTEMP)
-check_function_exists(mkstemp HAVE_MKSTEMP)
+check_function_exists(fcntl HAVE_FCNTL)
 check_function_exists(strerror HAVE_STRERROR)
 check_function_exists(getcwd HAVE_GETCWD)
 check_function_exists(stpcpy HAVE_STPCPY)
@@ -81,13 +83,14 @@ check_symbol_exists(asprintf "stdio.h" HAVE_ASPRINTF)
 check_symbol_exists(wprintf "stdio.h" HAVE_WPRINTF)
 check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF)
 check_symbol_exists(printf "stdio.h" HAVE_POSIX_PRINTF)
-check_symbol_exists(fcntl "stdio.h" HAVE_FCNTL)
 check_symbol_exists(pid_t "sys/types.h" HAVE_PID_T)
 check_symbol_exists(intmax_t "inttypes.h" HAVE_INTTYPES_H_WITH_UINTMAX)
 check_symbol_exists(uintmax_t "stdint.h" HAVE_STDINT_H_WITH_UINTMAX)
 check_symbol_exists(LC_MESSAGES "locale.h" HAVE_LC_MESSAGES)
 
 check_type_size(intmax_t HAVE_INTMAX_T)
+macro_bool_to_01(HAVE_UINTMAX_T HAVE_STDINT_H_WITH_UINTMAX)
+
 check_type_size("long double"  HAVE_LONG_DOUBLE)
 check_type_size("long long"  HAVE_LONG_LONG)
 check_type_size(wchar_t HAVE_WCHAR_T)
@@ -106,15 +109,6 @@ check_type_size(wint_t  HAVE_WINT_T)
 #      "
 #HAVE_STD_COUNT)
 
-check_cxx_source_compiles(
-       "
-       #include <streambuf>
-       #include <istream>
-       typedef std::istreambuf_iterator<char> type;
-       int main(){return 0;}
-       "
-HAVE_DECL_ISTREAMBUF_ITERATOR)
-
 #check_cxx_source_compiles(
 #      "
 #      #include <cctype>