From 777e0b3c4cadd322da83f01a9b38d14065d41a8d Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 17 Jan 2005 23:49:43 +0000 Subject: [PATCH] BUG: Fix patch for HAVE_SA_LEN wasnt working on linux anymore --- CMakeLists.txt | 16 ++++++++-------- gdcmConfigure.h.in | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c145666..fdc9ff04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,33 +64,33 @@ ENDIF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$") #----------------------------------------------------------------------------- # Test if os defines a lenght for sockaddr -IF("GDCM_OS_HAVE_SA_LEN" MATCHES "^GDCM_OS_HAVE_SA_LEN$") +IF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$") STRING(ASCII 35 POUND) FILE(WRITE ${GDCM_BINARY_DIR}/CMakeTmp/gdcmTestHAVESALEN.c "${POUND}include \n" "${POUND}include \n" "int main() { struct sockaddr sa; sa.sa_len = 0; }") MESSAGE(STATUS "Checking if ifreq has a sa_len") - TRY_COMPILE(GDCM_OS_HAVE_SA_LEN + TRY_COMPILE(HAVE_SA_LEN ${GDCM_BINARY_DIR} ${GDCM_BINARY_DIR}/CMakeTmp/gdcmTestHAVESALEN.c OUTPUT_VARIABLE OUTPUT) - IF(GDCM_OS_HAVE_SA_LEN) + IF(HAVE_SA_LEN) MESSAGE(STATUS "Checking if ifreq has a sa_len -- yes") - SET(GDCM_OS_HAVE_SA_LEN 1 CACHE INTERNAL "Support if ifreq has a sa_len") + SET(HAVE_SA_LEN 1 CACHE INTERNAL "Support if ifreq has a sa_len") WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log "Determining if ifreq has a sa_len" "passed with the following output:\n" "${OUTPUT}\n" APPEND) - ELSE(GDCM_OS_HAVE_SA_LEN) + ELSE(HAVE_SA_LEN) MESSAGE(STATUS "Checking if ifreq has a sa_len -- no") - SET(GDCM_OS_HAVE_SA_LEN 0 CACHE INTERNAL "Support if ifreq has a sa_len") + SET(HAVE_SA_LEN 0 CACHE INTERNAL "Support if ifreq has a sa_len") WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if ifreq has a sa_len" "failed with the following output:\n" "${OUTPUT}\n" APPEND) - ENDIF(GDCM_OS_HAVE_SA_LEN) -ENDIF("GDCM_OS_HAVE_SA_LEN" MATCHES "^GDCM_OS_HAVE_SA_LEN$") + ENDIF(HAVE_SA_LEN) +ENDIF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$") #----------------------------------------------------------------------------- # Build directory on which many applications depend diff --git a/gdcmConfigure.h.in b/gdcmConfigure.h.in index 839fe32b..311f2b30 100644 --- a/gdcmConfigure.h.in +++ b/gdcmConfigure.h.in @@ -48,8 +48,7 @@ #cmakedefine CMAKE_HAVE_NETINET_IN_H #cmakedefine CMAKE_HAVE_NET_IF_DL_H #cmakedefine CMAKE_HAVE_NET_IF_ARP_H - -#define HAVE_SA_LEN @GDCM_OS_HAVE_SA_LEN@ +#cmakedefine HAVE_SA_LEN /*--------------------------------------------------------------------------*/ -- 2.45.1