BUG: Fix bug Bug #1487 - CHECK_INCLUDE_FILE now use CHECK_INCLUDE_FILES properly...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af56a03a3629481ef5ac0acba85bdbef23a46669..4ebaa055b006fc2b71af1f71c9856dae4a85ebc7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,16 +99,27 @@ TEST_BIG_ENDIAN(GDCM_WORDS_BIGENDIAN)
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 CHECK_INCLUDE_FILE("stdint.h"       CMAKE_HAVE_STDINT_H)
 
+# Check if header file exists and add it to the list.
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
+MACRO(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
+  CHECK_INCLUDE_FILES("${GDCM_INCLUDES};${FILE}" ${VARIABLE})
+  IF(${VARIABLE})
+    SET(GDCM_INCLUDES ${GDCM_INCLUDES} ${FILE})
+  ENDIF(${VARIABLE})
+ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
+
 # Need those header for GetMacAddress in Util
-CHECK_INCLUDE_FILE("unistd.h"       CMAKE_HAVE_UNISTD_H)
-CHECK_INCLUDE_FILE("stdlib.h"       CMAKE_HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE("sys/ioctl.h"    CMAKE_HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILE("sys/socket.h"   CMAKE_HAVE_SYS_SOCKET_H)
-CHECK_INCLUDE_FILE("sys/sockio.h"   CMAKE_HAVE_SYS_SOCKIO_H)
-CHECK_INCLUDE_FILE("net/if.h"       CMAKE_HAVE_NET_IF_H)
-CHECK_INCLUDE_FILE("netinet/in.h"   CMAKE_HAVE_NETINET_IN_H)
-CHECK_INCLUDE_FILE("net/if_dl.h"    CMAKE_HAVE_NET_IF_DL_H)
-CHECK_INCLUDE_FILE("net/if_arp.h"   CMAKE_HAVE_NET_IF_ARP_H)
+# This is tricky as you need to figure out the proper order to
+# test the inclusion of files
+CHECK_INCLUDE_FILE_CONCAT("unistd.h"       CMAKE_HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE_CONCAT("stdlib.h"       CMAKE_HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE_CONCAT("sys/ioctl.h"    CMAKE_HAVE_SYS_IOCTL_H)
+CHECK_INCLUDE_FILE_CONCAT("sys/socket.h"   CMAKE_HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILE_CONCAT("sys/sockio.h"   CMAKE_HAVE_SYS_SOCKIO_H)
+CHECK_INCLUDE_FILE_CONCAT("net/if.h"       CMAKE_HAVE_NET_IF_H)
+CHECK_INCLUDE_FILE_CONCAT("netinet/in.h"   CMAKE_HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILE_CONCAT("net/if_dl.h"    CMAKE_HAVE_NET_IF_DL_H)
+CHECK_INCLUDE_FILE_CONCAT("net/if_arp.h"   CMAKE_HAVE_NET_IF_ARP_H)
 
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 34359bddd423d9c0953c27600ae13921b1640ad6..0f121c26635a1f948b7e92ff4a8b3b7c4abc7cee 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/17 16:50:35 $
-  Version:   $Revision: 1.105 $
+  Date:      $Date: 2005/01/17 17:26:55 $
+  Version:   $Revision: 1.106 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -52,9 +52,6 @@
 // How do I do that in CMake ?
 #ifdef __APPLE__
    #define HAVE_SA_LEN
-   #define CMAKE_HAVE_NET_IF_DL_H
-   #define CMAKE_HAVE_NETINET_IN_H
-   #define CMAKE_HAVE_NET_IF_H
 #endif //APPLE
 
 #ifdef CMAKE_HAVE_SYS_IOCTL_H
@@ -75,8 +72,7 @@
 #ifdef CMAKE_HAVE_NET_IF_DL_H
    #include <net/if_dl.h>
 #endif
-#ifdef __sun
-   //#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun)
+#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun)
    // This is absolutely necesseray on SunOS
    #include <net/if_arp.h>
 #endif