Fix:Build/cmake:Proberly detect header file before setting defines

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4008 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index d6e66c8..c02c695 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -88,6 +88,8 @@ CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD)
 CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET)
 CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES)
 CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL)
+CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H)
 
 ### Configure build
 #Required libraries, supplied with navit

diff --git a/navit/config.h.cmake b/navit/config.h.cmake
index 1c53240..0214987 100644 (file)
--- a/navit/config.h.cmake
+++ b/navit/config.h.cmake
@@ -54,9 +54,9 @@
 
 #cmakedefine HAVE_LC_MESSAGES 1
 
-#define HAVE_SYS_TIME_H 1
+#cmakedefine HAVE_SYS_TIME_H 1
 
-#define HAVE_GETOPT_H 1
+#cmakedefine HAVE_GETOPT_H 1
 
 #ifdef _MSC_VER
 #define __PRETTY_FUNCTION__ __FILE__":" << __LINE__