Revision: 41190
http://brlcad.svn.sourceforge.net/brlcad/?rev=41190&view=rev
Author: starseeker
Date: 2010-10-29 19:35:23 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Move most of the macros implemented so far, fix some errors in what was being
tested.
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:22:12 UTC
(rev 41189)
+++ brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-10-29 19:35:23 UTC
(rev 41190)
@@ -479,7 +479,7 @@
# SC_TCL_GETHOSTBYADDR_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETHOSTBYADDR_R)
- CHECK_FUNCTION_EXISTS_D(gethostbyaddr HAVE_GETHOSTBYADDR_R)
+ CHECK_FUNCTION_EXISTS_D(gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
IF(HAVE_GETHOSTBYADDR_R)
SET(HAVE_GETHOSTBYADDR_R_7_SRC "
#include <netdb.h>
@@ -602,8 +602,178 @@
ENDIF(HAVE_GETADDRINFO)
ENDMACRO(SC_TCL_GETADDRINFO)
+#--------------------------------------------------------------------
+# SC_TCL_GETPWUID_R
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETPWUID_R)
+ CHECK_FUNCTION_EXISTS_D(getpwuid_r HAVE_GETPWUID_R)
+ IF(HAVE_GETPWUID_R)
+ SET(HAVE_GETPWUID_R_5_SRC "
+#include <sys/types.h>
+#include <pwd.h>
+int main(){
+uid_t uid;
+struct passwd pw, *pwp;
+char buf[512];
+int buflen = 512;
+(void) getpwuid_r(uid, &pw, buf, buflen, &pwp);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETPWUID_R_5_SRC}"
HAVE_GETPWUID_R_5)
+ IF(HAVE_GETPWUID_R_5)
+ ADD_TCL_CFLAG(HAVE_GETPWUID_R_5)
+ ELSE(HAVE_GETPWUID_R_5)
+ SET(HAVE_GETPWUID_R_4_SRC "
+#include <sys/types.h>
+#include <pwd.h>
+int main(){
+uid_t uid;
+struct passwd pw;
+char buf[512];
+int buflen = 512;
+(void) getpwuid_r(uid, &pw, buf, buflen);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETPWUID_R_4_SRC}"
HAVE_GETPWUID_R_4)
+ IF(HAVE_GETPWUID_R_4)
+ ADD_TCL_CFLAG(HAVE_GETPWUID_R_4)
+ ENDIF(HAVE_GETPWUID_R_4)
+ ENDIF(HAVE_GETPWUID_R_5)
+ ENDIF(HAVE_GETPWUID_R)
+ENDMACRO(SC_TCL_GETPWUID_R)
+
+#--------------------------------------------------------------------
+# SC_TCL_GETPWNAM_R
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETPWNAM_R)
+ CHECK_FUNCTION_EXISTS_D(getpwnam_r HAVE_GETPWNAM_R)
+ IF(HAVE_GETPWNAM_R)
+ SET(HAVE_GETPWNAM_R_5_SRC "
+#include <sys/types.h>
+#include <pwd.h>
+int main(){
+char *name;
+struct passwd pw, *pwp;
+char buf[512];
+int buflen = 512;
+
+(void) getpwnam_r(name, &pw, buf, buflen, &pwp);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETPWNAM_R_5_SRC}"
HAVE_GETPWNAM_R_5)
+ IF(HAVE_GETPWNAM_R_5)
+ ADD_TCL_CFLAG(HAVE_GETPWNAM_R_5)
+ ELSE(HAVE_GETPWNAM_R_5)
+ SET(HAVE_GETPWNAM_R_4_SRC "
+#include <sys/types.h>
+#include <pwd.h>
+int main(){
+char *name;
+struct passwd pw;
+char buf[512];
+int buflen = 512;
+
+(void)getpwnam_r(name, &pw, buf, buflen);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETPWNAM_R_4_SRC}"
HAVE_GETPWNAM_R_4)
+ IF(HAVE_GETPWNAM_R_4)
+ ADD_TCL_CFLAG(HAVE_GETPWNAM_R_4)
+ ENDIF(HAVE_GETPWNAM_R_4)
+ ENDIF(HAVE_GETPWNAM_R_5)
+ ENDIF(HAVE_GETPWNAM_R)
+ENDMACRO(SC_TCL_GETPWNAM_R)
+
+#--------------------------------------------------------------------
+# SC_TCL_GETGRGID_R
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETGRGID_R)
+ CHECK_FUNCTION_EXISTS_D(getgrgid_r HAVE_GETGRGID_R)
+ IF(HAVE_GETGRGID_R)
+ SET(HAVE_GETGRGID_R_5_SRC "
+#include <sys/types.h>
+#include <grp.h>
+int main(){
+gid_t gid;
+struct group gr, *grp;
+char buf[512];
+int buflen = 512;
+
+(void) getgrgid_r(gid, &gr, buf, buflen, &grp);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETGRGID_R_5_SRC}"
HAVE_GETGRGID_R_5)
+ IF(HAVE_GETGRGID_R_5)
+ ADD_TCL_CFLAG(HAVE_GETGRGID_R_5)
+ ELSE(HAVE_GETGRGID_R_5)
+ SET(HAVE_GETGRGID_R_4_SRC "
+#include <sys/types.h>
+#include <grp.h>
+int main(){
+gid_t gid;
+struct group gr;
+char buf[512];
+int buflen = 512;
+
+(void)getgrgid_r(gid, &gr, buf, buflen);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETGRGID_R_4_SRC}"
HAVE_GETGRGID_R_4)
+ IF(HAVE_GETGRGID_R_4)
+ ADD_TCL_CFLAG(HAVE_GETGRGID_R_4)
+ ENDIF(HAVE_GETGRGID_R_4)
+ ENDIF(HAVE_GETGRGID_R_5)
+ ENDIF(HAVE_GETGRGID_R)
+ENDMACRO(SC_TCL_GETGRGID_R)
+
+#--------------------------------------------------------------------
+# SC_TCL_GETGRNAM_R
+#--------------------------------------------------------------------
+MACRO(SC_TCL_GETGRNAM_R)
+ CHECK_FUNCTION_EXISTS_D(getgrnam_r HAVE_GETGRNAM_R)
+ IF(HAVE_GETGRNAMM_R)
+ SET(HAVE_GETGRNAMM_R_5_SRC "
+#include <sys/types.h>
+#include <grp.h>
+int main(){
+char *name;
+struct group gr, *grp;
+char buf[512];
+int buflen = 512;
+
+(void) getgrnam_r(name, &gr, buf, buflen, &grp);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETGRNAMM_R_5_SRC}"
HAVE_GETGRNAMM_R_5)
+ IF(HAVE_GETGRNAMM_R_5)
+ ADD_TCL_CFLAG(HAVE_GETGRNAMM_R_5)
+ SET(TCL_CFLAGS "${TCL_CFLAGS} -DHAVE_GETGRNAMM_R_5=1")
+ ELSE(HAVE_GETGRNAMM_R_5)
+ SET(HAVE_GETGRNAMM_R_4_SRC "
+#include <sys/types.h>
+#include <grp.h>
+int main(){
+char *name;
+struct group gr;
+char buf[512];
+int buflen = 512;
+
+(void)getgrnam_r(name, &gr, buf, buflen);
+return 0;}
+ ")
+ CHECK_C_SOURCE_COMPILES("${HAVE_GETGRNAMM_R_4_SRC}"
HAVE_GETGRNAMM_R_4)
+ IF(HAVE_GETGRNAMM_R_4)
+ ADD_TCL_CFLAG(HAVE_GETGRNAMM_R_4)
+ ENDIF(HAVE_GETGRNAMM_R_4)
+ ENDIF(HAVE_GETGRNAMM_R_5)
+ ENDIF(HAVE_GETGRNAMM_R)
+ENDMACRO(SC_TCL_GETGRNAM_R)
+
+
+
+
MACRO(CHECK_FD_SET_IN_TYPES_D)
SET(TEST_SRC "
#include <sys/types.h>
@@ -624,7 +794,5 @@
CHECK_C_SOURCE_COMPILES("${TEST_SRC}" COMPILER_SUPPORTS_HIDDEN)
ENDMACRO(CHECK_COMPILER_SUPPORTS_HIDDEN_D)
-MACRO(CHECK_GETADDERINFO_WORKING_D)
-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:22:12 UTC
(rev 41189)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 19:35:23 UTC
(rev 41190)
@@ -223,155 +223,15 @@
# Thread safe tests - need to go over macros and
# get the right logic going here
IF(TCL_THREADS)
- CHECK_FUNCTION_EXISTS_D(getpwuid HAVE_GETPWUID_R)
- IF(HAVE_GETPWUID_R)
- SET(HAVE_GETPWUID_R_5_SRC "
- #include <sys/types.h>
- #include <pwd.h>
- int main(){
- uid_t uid;
- struct passwd pw, *pwp;
- char buf[512];
- int buflen = 512;
- (void) getpwuid_r(uid, &pw, buf, buflen, &pwp);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETPWUID_R_5_SRC}"
HAVE_GETPWUID_R_5)
- IF(HAVE_GETPWUID_R_5)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DHAVE_GETPWUID_R_5=1")
- ELSE(HAVE_GETPWUID_R_5)
- SET(HAVE_GETPWUID_R_4_SRC "
- #include <sys/types.h>
- #include <pwd.h>
- int main(){
- uid_t uid;
- struct passwd pw;
- char buf[512];
- int buflen = 512;
+ SC_TCL_GETPWUID_R()
- (void) getpwuid_r(uid, &pw, buf, buflen);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETPWUID_R_4_SRC}"
HAVE_GETPWUID_R_4)
- IF(HAVE_GETPWUID_R_4)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETPWUID_R_4=1")
- ENDIF(HAVE_GETPWUID_R_4)
- ENDIF(HAVE_GETPWUID_R_5)
- ENDIF(HAVE_GETPWUID_R)
+ SC_TCL_GETPWNAM_R()
- CHECK_FUNCTION_EXISTS_D(getpwnam HAVE_GETPWNAM_R)
- IF(HAVE_GETPWNAM_R)
- SET(HAVE_GETPWNAM_R_5_SRC "
- #include <sys/types.h>
- #include <pwd.h>
- int main(){
- char *name;
- struct passwd pw, *pwp;
- char buf[512];
- int buflen = 512;
+ SC_TCL_GETGRGID_R()
- (void) getpwnam_r(name, &pw, buf, buflen, &pwp);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETPWNAM_R_5_SRC}"
HAVE_GETPWNAM_R_5)
- IF(HAVE_GETPWNAM_R_5)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DHAVE_GETPWNAM_R_5=1")
- ELSE(HAVE_GETPWNAM_R_5)
- SET(HAVE_GETPWNAM_R_4_SRC "
- #include <sys/types.h>
- #include <pwd.h>
- int main(){
- char *name;
- struct passwd pw;
- char buf[512];
- int buflen = 512;
+ SC_TCL_GETGRNAM_R()
- (void)getpwnam_r(name, &pw, buf, buflen);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETPWNAM_R_4_SRC}"
HAVE_GETPWNAM_R_4)
- IF(HAVE_GETPWNAM_R_4)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETPWNAM_R_4=1")
- ENDIF(HAVE_GETPWNAM_R_4)
- ENDIF(HAVE_GETPWNAM_R_5)
- ENDIF(HAVE_GETPWNAM_R)
-
- CHECK_FUNCTION_EXISTS_D(getgrgid HAVE_GETGRGID_R)
- IF(HAVE_GETGRGID_R)
- SET(HAVE_GETGRGID_R_5_SRC "
- #include <sys/types.h>
- #include <grp.h>
- int main(){
- gid_t gid;
- struct group gr, *grp;
- char buf[512];
- int buflen = 512;
-
- (void) getgrgid_r(gid, &gr, buf, buflen, &grp);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETGRGID_R_5_SRC}"
HAVE_GETGRGID_R_5)
- IF(HAVE_GETGRGID_R_5)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DHAVE_GETGRGID_R_5=1")
- ELSE(HAVE_GETGRGID_R_5)
- SET(HAVE_GETGRGID_R_4_SRC "
- #include <sys/types.h>
- #include <grp.h>
- int main(){
- gid_t gid;
- struct group gr;
- char buf[512];
- int buflen = 512;
-
- (void)getgrgid_r(gid, &gr, buf, buflen);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETGRGID_R_4_SRC}"
HAVE_GETGRGID_R_4)
- IF(HAVE_GETGRGID_R_4)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETGRGID_R_4=1")
- ENDIF(HAVE_GETGRGID_R_4)
- ENDIF(HAVE_GETGRGID_R_5)
- ENDIF(HAVE_GETGRGID_R)
-
-
- CHECK_FUNCTION_EXISTS_D(getgrnam HAVE_GETGRNAM_R)
- IF(HAVE_GETGRNAMM_R)
- SET(HAVE_GETGRNAMM_R_5_SRC "
- #include <sys/types.h>
- #include <grp.h>
- int main(){
- char *name;
- struct group gr, *grp;
- char buf[512];
- int buflen = 512;
-
- (void) getgrnam_r(name, &gr, buf, buflen, &grp);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETGRNAMM_R_5_SRC}"
HAVE_GETGRNAMM_R_5)
- IF(HAVE_GETGRNAMM_R_5)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DHAVE_GETGRNAMM_R_5=1")
- ELSE(HAVE_GETGRNAMM_R_5)
- SET(HAVE_GETGRNAMM_R_4_SRC "
- #include <sys/types.h>
- #include <grp.h>
- int main(){
- char *name;
- struct group gr;
- char buf[512];
- int buflen = 512;
-
- (void)getgrnam_r(name, &gr, buf, buflen);
- return 0;}
- ")
- CHECK_C_SOURCE_COMPILES("${HAVE_GETGRNAMM_R_4_SRC}"
HAVE_GETGRNAMM_R_4)
- IF(HAVE_GETGRNAMM_R_4)
- SET(TCL_CFLAGS "${TCL_CFLAGS}
-DHAVE_GETGRNAMM_R_4=1")
- ENDIF(HAVE_GETGRNAMM_R_4)
- ENDIF(HAVE_GETGRNAMM_R_5)
- ENDIF(HAVE_GETGRNAMM_R)
-
IF(NOT HAVE_GETHOSTBYNAME)
CHECK_LIBRARY(GHBN lnsl gethostbyname)
SET(HAVE_GETHOSTBYNAME ${GHBN})
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
