[cmake] kill some more unused tests

diff --git a/src/portable.h b/src/portable.h
index d09a1df..d3d435b 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -77,16 +77,10 @@
  **** Time handling
  ****/
 
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
 #  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 /****
  **** Signals

diff --git a/tools/cmake/CompleteInFiles.cmake b/tools/cmake/CompleteInFiles.cmake
index c28fc82..7575a6a 100644 (file)
--- a/tools/cmake/CompleteInFiles.cmake
+++ b/tools/cmake/CompleteInFiles.cmake
@@ -158,12 +158,10 @@ else()
   set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
 endif()
 
-CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
 CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H)
 CHECK_INCLUDE_FILE("socket.h" HAVE_SOCKET_H)
-CHECK_INCLUDE_FILE("sys/socket.h" HAVE_SYS_SOCKET_H)
 CHECK_INCLUDE_FILE("stat.h" HAVE_STAT_H)
 CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
@@ -175,10 +173,6 @@ CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
 CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H)
-CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
 CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
 CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H)
@@ -293,11 +287,6 @@ if(enable_smpi)
   endif()
 endif()
 
-#--------------------------------------------------------------------------------------------------
-### Check for some architecture dependent values
-CHECK_TYPE_SIZE(int SIZEOF_INT)
-CHECK_TYPE_SIZE(void* SIZEOF_VOIDP)
-
 #--------------------------------------------------------------------------------------------------
 ### Check for GNU dynamic linker
 CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)

diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake
index 971b768..2f9906e 100644 (file)
--- a/tools/cmake/PrintArgs.cmake
+++ b/tools/cmake/PrintArgs.cmake
@@ -22,12 +22,10 @@ if(enable_print_message)
   message("HAVE_MUTEX_TIMEDLOCK ........: ${HAVE_MUTEX_TIMEDLOCK_LIB}")
   message("HAVE_POSIX_GETTIME ..........: ${HAVE_POSIX_GETTIME}")
   message("")
-  message("TIME_WITH_SYS_TIME ..........: ${TIME_WITH_SYS_TIME}")
   message("STDC_HEADERS ................: ${STDC_HEADERS}")
   message("HAVE_PTHREAD_H ..............: ${HAVE_PTHREAD_H}")
   message("HAVE_VALGRIND_VALGRIND_H ....: ${HAVE_VALGRIND_VALGRIND_H}")
   message("HAVE_SOCKET_H ...............: ${HAVE_SOCKET_H}")
-  message("HAVE_SYS_SOCKET_H ...........: ${HAVE_SYS_SOCKET_H}")
   message("HAVE_STAT_H .................: ${HAVE_STAT_H}")
   message("HAVE_SYS_STAT_H .............: ${HAVE_SYS_STAT_H}")
   message("HAVE_WINDOWS_H ..............: ${HAVE_WINDOWS_H}")
@@ -38,10 +36,6 @@ if(enable_print_message)
   message("HAVE_SYS_TIME_H .............: ${HAVE_SYS_TIME_H}")
   message("HAVE_TIME_H .................: ${HAVE_TIME_H}")
   message("HAVE_DLFCN_H ................: ${HAVE_DLFCN_H}")
-  message("HAVE_INTTYPES_H .............: ${HAVE_INTTYPES_H}")
-  message("HAVE_MEMORY_H ...............: ${HAVE_MEMORY_H}")
-  message("HAVE_STDLIB_H ...............: ${HAVE_STDLIB_H}")
-  message("HAVE_STRINGS_H ..............: ${HAVE_STRINGS_H}")
   message("HAVE_STRING_H ...............: ${HAVE_STRING_H}")
   message("HAVE_STDIO_H ................: ${HAVE_STDIO_H}")
 

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index 2095a52..da87ea0 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -27,9 +27,6 @@
        #endif
 #endif
 
-#cmakedefine SIZEOF_INT @SIZEOF_INT@
-#cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@
-
 /* If __thread is available */
 #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@
 
@@ -155,9 +152,6 @@
 /* Indicates that we have NS3 support */
 #cmakedefine HAVE_NS3 @HAVE_NS3@
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
-
 /* defines whether Lua bindings must be compiled or not */
 #cmakedefine HAVE_LUA @HAVE_LUA@
 
@@ -167,9 +161,6 @@
 /* Define to 1 if you have the `makecontext' function. */
 #cmakedefine HAVE_MAKECONTEXT @HAVE_MAKECONTEXT@
 
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@
-
 /* Define if pthread_mutex_timedlock() is avaible or not (part of XPG6
    standard only?) */
 #cmakedefine HAVE_MUTEX_TIMEDLOCK @HAVE_MUTEX_TIMEDLOCK@
@@ -201,21 +192,12 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@
-
 /* Define to 1 if you have the <string.h> header file. */
 #cmakedefine HAVE_STRING_H @HAVE_STRING_H@
 
 /* Define to 1 if you have the `sysconf' function. */
 #cmakedefine HAVE_SYSCONF @HAVE_SYSCONF@
 
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
 
@@ -286,9 +268,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS @STDC_HEADERS@
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#cmakedefine TIME_WITH_SYS_TIME @TIME_WITH_SYS_TIME@
-
 /* Tracking of latency bound */
 #cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@