Revision: 41188
http://brlcad.svn.sourceforge.net/brlcad/?rev=41188&view=rev
Author: starseeker
Date: 2010-10-29 19:21:19 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Move some more tests into macro wrappers.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-10-29 19:18:55 UTC
(rev 41187)
+++ brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-10-29 19:21:19 UTC
(rev 41188)
@@ -475,6 +475,135 @@
SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_CFGVAL_ENCODING=\"${TCL_CFGVAL_ENCODING}\"" CACHE STRING "TCL CFLAGS"
FORCE)
ENDMACRO(SC_TCL_CFG_ENCODING)
+#--------------------------------------------------------------------
+# SC_TCL_GETHOSTBYADDR_R
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETHOSTBYADDR_R)
+ CHECK_FUNCTION_EXISTS_D(gethostbyaddr HAVE_GETHOSTBYADDR_R)
+ IF(HAVE_GETHOSTBYADDR_R)
+ SET(HAVE_GETHOSTBYADDR_R_7_SRC "
+#include <netdb.h>
+int main(){
+char *addr;
+int length;
+int type;
+struct hostent *result;
+char buffer[2048];
+int buflen = 2048;
+int h_errnop;
+
+(void) gethostbyaddr_r(addr, length, type, result, buffer, buflen, &h_errnop);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYADDR_R_7_SRC}"
HAVE_GETHOSTBYADDR_R_7)
+ IF(HAVE_GETHOSTBYADDR_R_7)
+ ADD_TCL_CFLAG(HAVE_GETHOSTBYADDR_R_7)
+ ELSE(HAVE_GETHOSTBYADDR_R_7)
+ SET(HAVE_GETHOSTBYADDR_R_8_SRC "
+#include <netdb.h>
+int main(){
+char *addr;
+int length;
+int type;
+struct hostent *result, *resultp;
+char buffer[2048];
+int buflen = 2048;
+int h_errnop;
+
+(void) gethostbyaddr_r(addr, length, type, result, buffer, buflen, &resultp,
&h_errnop);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYADDR_R_8_SRC}"
HAVE_GETHOSTBYADDR_R_8)
+ IF(HAVE_GETHOSTBYADDR_R_8)
+ ADD_TCL_CFLAG(HAVE_GETHOSTBYADDR_R_8)
+ ENDIF(HAVE_GETHOSTBYADDR_R_8)
+ ENDIF(HAVE_GETHOSTBYADDR_R_7)
+ ENDIF(HAVE_GETHOSTBYADDR_R)
+ENDMACRO(SC_TCL_GETHOSTBYADDR_R)
+
+#--------------------------------------------------------------------
+# SC_TCL_GETHOSTBYNAME_R
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETHOSTBYNAME_R)
+ CHECK_FUNCTION_EXISTS_D(gethostbyname_r HAVE_GETHOSTBYNAME_R)
+ IF(HAVE_GETHOSTBYNAME_R)
+ SET(HAVE_GETHOSTBYNAME_R_6_SRC "
+#include <netdb.h>
+int main(){
+char *name;
+struct hostent *he, *res;
+char buffer[2048];
+int buflen = 2048;
+int h_errnop;
+
+(void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_6_SRC}"
HAVE_GETHOSTBYNAME_R_5)
+ IF(HAVE_GETHOSTBYNAME_R_6)
+ ADD_TCL_CFLAG(HAVE_GETHOSTBYNAME_R_6)
+ ELSE(HAVE_GETHOSTBYNAME_R_6)
+ SET(HAVE_GETHOSTBYNAME_R_5_SRC "
+#include <netdb.h>
+int main(){
+char *name;
+struct hostent *he;
+char buffer[2048];
+int buflen = 2048;
+int h_errnop;
+
+(void) gethostbyname_r(name, he, buffer, buflen, &h_errnop);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_5_SRC}"
HAVE_GETHOSTBYNAME_R_5)
+
+ IF(HAVE_GETHOSTBYNAME_R_5)
+ ADD_TCL_CFLAG(HAVE_GETHOSTBYNAME_R_5)
+ ELSE(HAVE_GETHOSTBYNAME_R_5)
+ SET(HAVE_GETHOSTBYNAME_R_3_SRC "
+#include <netdb.h>
+int main(){
+char *name;
+struct hostent *he;
+struct hostent_data data;
+
+(void) gethostbyname_r(name, he, &data);
+return 0;}
+ ")
+
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_3_SRC}" HAVE_GETHOSTBYNAME_R_3)
+ IF(HAVE_GETHOSTBYNAME_R_3)
+ ADD_TCL_CFLAG(HAVE_GETHOSTBYNAME_R_3)
+ ENDIF(HAVE_GETHOSTBYNAME_R_3)
+ ENDIF(HAVE_GETHOSTBYNAME_R_5)
+ ENDIF(HAVE_GETHOSTBYNAME_R_6)
+ ENDIF(HAVE_GETHOSTBYNAME_R)
+ENDMACRO(SC_TCL_GETHOSTBYNAME_R)
+
+#--------------------------------------------------------------------
+# SC_TCL_GETADDRINFO
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETADDRINFO)
+ CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO)
+ IF(HAVE_GETADDRINFO)
+ SET(GETADDERINFO_SRC "
+#include <netdb.h>
+int main () {
+const char *name, *port;
+struct addrinfo *aiPtr, hints;
+(void)getaddrinfo(name,port, &hints, &aiPtr);
+(void)freeaddrinfo(aiPtr);
+return 0;
+}
+ ")
+ CHECK_C_SOURCE_COMPILES("${GETADDERINFO_SRC}"
WORKING_GETADDERINFO)
+ IF(WORKING_GETADDERINFO)
+ ADD_TCL_CFLAG(HAVE_GETADDERINFO)
+ ENDIF(WORKING_GETADDERINFO)
+ ENDIF(HAVE_GETADDRINFO)
+ENDMACRO(SC_TCL_GETADDRINFO)
+
+
+
MACRO(CHECK_FD_SET_IN_TYPES_D)
SET(TEST_SRC "
#include <sys/types.h>
@@ -496,19 +625,6 @@
ENDMACRO(CHECK_COMPILER_SUPPORTS_HIDDEN_D)
MACRO(CHECK_GETADDERINFO_WORKING_D)
- SET(GETADDERINFO_SRC "
- #include <netdb.h>
- int main () {
- const char *name, *port;
- struct addrinfo *aiPtr, hints;
- (void)getaddrinfo(name,port, &hints, &aiPtr);
- (void)freeaddrinfo(aiPtr);
- return 0;
- }")
- CHECK_C_SOURCE_COMPILES("${GETADDERINFO_SRC}" WORKING_GETADDERINFO)
- IF(WORKING_GETADDERINFO)
- SET(${CFLAGS_NAME}_CFLAGS "${${CFLAGS_NAME}_CFLAGS}
-DHAVE_GETADDERINFO=1" CACHE STRING "TCL CFLAGS" FORCE)
- ENDIF(WORKING_GETADDERINFO)
ENDMACRO(CHECK_GETADDERINFO_WORKING_D)
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 19:18:55 UTC
(rev 41187)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 19:21:19 UTC
(rev 41188)
@@ -218,12 +218,8 @@
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_REALPATH=1")
ENDIF(NOT HAVE_REALPATH)
-CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO)
-IF(HAVE_GETADDRINFO)
- CHECK_GETADDERINFO_WORKING_D()
-ENDIF(HAVE_GETADDRINFO)
+SC_TCL_GETADDRINFO()
-
# Thread safe tests - need to go over macros and
# get the right logic going here
IF(TCL_THREADS)
@@ -381,102 +377,9 @@
SET(HAVE_GETHOSTBYNAME ${GHBN})
ENDIF(NOT HAVE_GETHOSTBYNAME)
- CHECK_FUNCTION_EXISTS_D(gethostbyname HAVE_GETHOSTBYNAME_R)
- IF(HAVE_GETHOSTBYNAME_R)
- SET(HAVE_GETHOSTBYNAME_R_6_SRC "
- #include <netdb.h>
- int main(){
- char *name;
- struct hostent *he, *res;
- char buffer[2048];
- int buflen = 2048;
- int h_errnop;
+ SC_TCL_GETHOSTBYADDR_R()
+ SC_TCL_GETHOSTBYNAME_R()
- (void) gethostbyname_r(name, he, buffer, buflen, &res,
&h_errnop);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_6_SRC}"
HAVE_GETHOSTBYNAME_R_5)
- IF(HAVE_GETHOSTBYNAME_R_6)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETHOSTBYNAME_R_6=1")
- ELSE(HAVE_GETHOSTBYNAME_R_6)
- SET(HAVE_GETHOSTBYNAME_R_5_SRC "
- #include <netdb.h>
- int main(){
- char *name;
- struct hostent *he;
- char buffer[2048];
- int buflen = 2048;
- int h_errnop;
-
- (void) gethostbyname_r(name, he, buffer, buflen,
&h_errnop);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_5_SRC}"
HAVE_GETHOSTBYNAME_R_5)
-
- IF(HAVE_GETHOSTBYNAME_R_5)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETHOSTBYNAME_R_5=1")
- ELSE(HAVE_GETHOSTBYNAME_R_5)
- SET(HAVE_GETHOSTBYNAME_R_3_SRC "
- #include <netdb.h>
- int main(){
- char *name;
- struct hostent *he;
- struct hostent_data data;
-
- (void) gethostbyname_r(name, he, &data);
- return 0;}
- ")
-
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_3_SRC}" HAVE_GETHOSTBYNAME_R_3)
- IF(HAVE_GETHOSTBYNAME_R_3)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETHOSTBYNAME_R_3=1")
- ENDIF(HAVE_GETHOSTBYNAME_R_3)
- ENDIF(HAVE_GETHOSTBYNAME_R_5)
- ENDIF(HAVE_GETHOSTBYNAME_R_6)
- ENDIF(HAVE_GETHOSTBYNAME_R)
-
-
- CHECK_FUNCTION_EXISTS_D(gethostbyaddr HAVE_GETHOSTBYADDR_R)
- IF(HAVE_GETHOSTBYADDR_R)
- SET(HAVE_GETHOSTBYADDR_R_7_SRC "
- #include <netdb.h>
- int main(){
- char *addr;
- int length;
- int type;
- struct hostent *result;
- char buffer[2048];
- int buflen = 2048;
- int h_errnop;
-
- (void) gethostbyaddr_r(addr, length, type, result, buffer,
buflen, &h_errnop);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYADDR_R_7_SRC}"
HAVE_GETHOSTBYADDR_R_7)
- IF(HAVE_GETHOSTBYADDR_R_7)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETHOSTBYADDR_R_7=1")
- ELSE(HAVE_GETHOSTBYADDR_R_7)
- SET(HAVE_GETHOSTBYADDR_R_8_SRC "
- #include <netdb.h>
- int main(){
- char *addr;
- int length;
- int type;
- struct hostent *result, *resultp;
- char buffer[2048];
- int buflen = 2048;
- int h_errnop;
-
- (void) gethostbyaddr_r(addr, length, type, result,
buffer, buflen, &resultp, &h_errnop);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYADDR_R_8_SRC}"
HAVE_GETHOSTBYADDR_R_8)
- IF(HAVE_GETHOSTBYADDR_R_8)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETHOSTBYADDR_R_8=1")
- ENDIF(HAVE_GETHOSTBYADDR_R_8)
- ENDIF(HAVE_GETHOSTBYADDR_R_7)
- ENDIF(HAVE_GETHOSTBYADDR_R)
-
-
IF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
STRING(REGEX REPLACE "\\..*" "" CMAKE_SYSTEM_MAJOR_VERSION
${CMAKE_SYSTEM_VERSION})
IF (${CMAKE_SYSTEM_MAJOR_VERSION} GREATER 5)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
