diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index 35b98d16..fa789d4d 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -58,7 +58,9 @@ INCLUDE(FindGnuplot)
 
 INCLUDE(CheckLibraryExists)
 
-INCLUDE(ConfigureChecks.cmake)
+IF(UNIX)
+  INCLUDE(ConfigureChecks.cmake)
+ENDIF(UNIX)
 
 INCLUDE(Dart OPTIONNAL)
 
diff --git a/eo/ConfigureChecks.cmake b/eo/ConfigureChecks.cmake
index ee687fdf..5fabc9c3 100644
--- a/eo/ConfigureChecks.cmake
+++ b/eo/ConfigureChecks.cmake
@@ -1,22 +1,22 @@
 # NOTE: only add something here if it is really needed by EO
 
-include(CheckIncludeFile)
-include(CheckIncludeFiles)
-include(CheckSymbolExists)
-include(CheckFunctionExists)
-include(CheckLibraryExists)
+INCLUDE(CheckIncludeFile)
+INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckSymbolExists)
+INCLUDE(CheckFunctionExists)
+INCLUDE(CheckLibraryExists)
 
-check_library_exists(m   cos "cos in libm" HAVE_LIBM)
+CHECK_LIBRARY_EXISTS(m	cos	"/usr/lib"	HAVE_LIBM)
 
-check_include_files(cmath.h  "cmath.h"      HAVE_CMATH_H)
-check_include_files(stdio.h  "stdio.h"      HAVE_STDIO_H)
-check_include_files(stdlib.h "stdlib.h"     HAVE_STDLIB_H)
-check_include_files(string.h  "string.h"    HAVE_STRING_H)
-check_include_files(strings.h "strings.h"   HAVE_STRINGS_H)
-check_include_files(malloc.h  "malloc.h"    HAVE_MALLOC_H)
-check_include_files(limits.h  "limits.h"    HAVE_LIMITS_H)
-check_include_files(unistd.h  "unistd.h"    HAVE_UNISTD_H)
-check_include_files(stdint.h  "stdint.h"    HAVE_STDINT_H)
+CHECK_INCLUDE_FILES(math.h	"math.h"	HAVE_MATH_H)
+CHECK_INCLUDE_FILES(stdio.h	"stdio.h"	HAVE_STDIO_H)
+CHECK_INCLUDE_FILES(stdlib.h	"stdlib.h"	HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES(string.h	"string.h"	HAVE_STRING_H)
+CHECK_INCLUDE_FILES(strings.h	"strings.h"	HAVE_STRINGS_H)
+CHECK_INCLUDE_FILES(malloc.h	"malloc.h"	HAVE_MALLOC_H)
+CHECK_INCLUDE_FILES(limits.h	"limits.h"	HAVE_LIMITS_H)
+CHECK_INCLUDE_FILES(unistd.h	"unistd.h"	HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES(stdint.h	"stdint.h"	HAVE_STDINT_H)
 
 
 # Use check_symbol_exists to check for symbols in a reliable
@@ -26,4 +26,4 @@ check_include_files(stdint.h  "stdint.h"    HAVE_STDINT_H)
 # specific order.  Refer to the man page for each symbol for which a
 # check is to be added to get the proper set of headers. Example :
 
-#check_symbol_exists(asymbol          "symbole.h"                 HAVE_SYMBOLE)
+#check_symbol_exists(asymbol	"symbole.h"	HAVE_SYMBOLE)