Revision: 41255
http://brlcad.svn.sourceforge.net/brlcad/?rev=41255&view=rev
Author: starseeker
Date: 2010-11-05 20:08:23 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
Shift tcl build to using changed macros.
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-11-05 19:52:31 UTC
(rev 41254)
+++ brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-11-05 20:08:23 UTC
(rev 41255)
@@ -278,21 +278,21 @@
# SC_MISSING_POSIX_HEADERS
#--------------------------------------------------------------------
MACRO(SC_MISSING_POSIX_HEADERS)
- CHECK_INCLUDE_FILE_D(dirent.h HAVE_DIRENT_H)
+ CONFIG_CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
IF(NOT HAVE_DIRENT_H)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_DIRENT_H=1")
ENDIF(NOT HAVE_DIRENT_H)
- CHECK_INCLUDE_FILE_USABILITY_D(float.h FLOAT_H)
- CHECK_INCLUDE_FILE_USABILITY_D(values.h VALUES_H)
- CHECK_INCLUDE_FILE_USABILITY_D(limits.h LIMITS_H)
- CHECK_INCLUDE_FILE_D(stdlib.h HAVE_STDLIB_H)
- CHECK_INCLUDE_FILE_D(string.h HAVE_STRING_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(float.h FLOAT_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(values.h VALUES_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(limits.h LIMITS_H)
+ CONFIG_CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
+ CONFIG_CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
IF(NOT HAVE_STRING_H)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_STRING_H=1")
ENDIF(NOT HAVE_STRING_H)
- CHECK_INCLUDE_FILE_USABILITY_D(sys/wait.h SYS_WAIT_H)
- CHECK_INCLUDE_FILE_USABILITY_D(dlfcn.h DLFCN_H)
- CHECK_INCLUDE_FILE_USABILITY_D(sys/param.h SYS_PARAM_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(sys/wait.h SYS_WAIT_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(dlfcn.h DLFCN_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(sys/param.h SYS_PARAM_H)
ENDMACRO(SC_MISSING_POSIX_HEADERS)
@@ -305,8 +305,8 @@
#--------------------------------------------------------------------
# SC_BLOCKING_STYLE
#--------------------------------------------------------------------
-CHECK_INCLUDE_FILE_D(sys/ioctl.h HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILE_D(sys/filio.h HAVE_SYS_FILIO_H)
+CONFIG_CHECK_INCLUDE_FILE(sys/ioctl.h HAVE_SYS_IOCTL_H)
+CONFIG_CHECK_INCLUDE_FILE(sys/filio.h HAVE_SYS_FILIO_H)
IF(${CMAKE_SYSTEM_NAME} MATCHES "^OSF.*")
ADD_TCL_CFLAG(USE_FIONBIO)
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "^OSF.*")
@@ -327,8 +327,8 @@
#
#--------------------------------------------------------------------
MACRO(SC_TIME_HANDLER)
- CHECK_INCLUDE_FILE_USABILITY_D(sys/time.h SYS_TIME_H)
- CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_zone time.h STRUCT_TM_TM_ZONE)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(sys/time.h SYS_TIME_H)
+ CONFIG_CHECK_STRUCT_HAS_MEMBER("struct tm" tm_zone time.h
STRUCT_TM_TM_ZONE)
IF(HAVE_STRUCT_TM_TM_ZONE)
ADD_TCL_CFLAG(HAVE_TM_ZONE)
ELSE(HAVE_STRUCT_TM_TM_ZONE)
@@ -345,11 +345,11 @@
ADD_TCL_CFLAG(HAVE_DECL_TZNAME)
ENDIF(HAVE_TZNAME)
ENDIF(HAVE_STRUCT_TM_TM_ZONE)
- CHECK_FUNCTION_EXISTS_D(gmtime_r HAVE_GMTIME_R)
- CHECK_FUNCTION_EXISTS_D(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_D(mktime HAVE_MKTIME)
- CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_tzadj time.h TM_TZADJ)
- CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_gmtoff time.h TM_GMTOFF)
+ CONFIG_CHECK_FUNCTION_EXISTS(gmtime_r HAVE_GMTIME_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(mktime HAVE_MKTIME)
+ CONFIG_CHECK_STRUCT_HAS_MEMBER("struct tm" tm_tzadj time.h TM_TZADJ)
+ CONFIG_CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff time.h TM_GMTOFF)
SET(TZONE_SRC_1 "
#include <time.h>
int main () {
@@ -393,7 +393,7 @@
SET(TCL_LINK_LIBS "")
CHECK_FUNCTION_EXISTS(sin, HAVE_MATHLIB)
IF(NOT HAVE_MATHLIB)
- CHECK_LIBRARY(M m sin)
+ CONFIG_CHECK_LIBRARY(M m sin)
ENDIF(NOT HAVE_MATHLIB)
IF(NOT IEEE_LIBRARY AND NOT IEEE_QUIET)
MESSAGE("-- Looking for IEEE library")
@@ -418,18 +418,18 @@
SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${IEEE_LIBRARY} ${M_LIBRARY}
${INET_LIBRARY} CACHE STRING "TCL CFLAGS" FORCE)
- CHECK_INCLUDE_FILE_USABILITY_D(net/errno.h NET_ERRNO_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(net/errno.h NET_ERRNO_H)
CHECK_FUNCTION_EXISTS(connect HAVE_CONNECT)
IF(NOT HAVE_CONNECT)
CHECK_FUNCTION_EXISTS(setsockopt HAVE_SETSOCKOPT)
IF(NOT HAVE_SETSOCKOPT)
- CHECK_LIBRARY(SOCKET socket setsocket)
+ CONFIG_CHECK_LIBRARY(SOCKET socket setsocket)
SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${SOCKET_LIBRARY}
CACHE STRING "TCL CFLAGS" FORCE)
ENDIF(NOT HAVE_SETSOCKOPT)
ENDIF(NOT HAVE_CONNECT)
CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
IF(NOT HAVE_GETHOSTBYNAME)
- CHECK_LIBRARY(NLS nls gethostbyname)
+ CONFIG_CHECK_LIBRARY(NLS nls gethostbyname)
SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${NLS_LIBRARY} CACHE STRING
"TCL CFLAGS" FORCE)
ENDIF(NOT HAVE_GETHOSTBYNAME)
@@ -500,7 +500,7 @@
# SC_TCL_GETHOSTBYADDR_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETHOSTBYADDR_R)
- CHECK_FUNCTION_EXISTS_D(gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
IF(HAVE_GETHOSTBYADDR_R)
SET(HAVE_GETHOSTBYADDR_R_7_SRC "
#include <netdb.h>
@@ -546,7 +546,7 @@
# SC_TCL_GETHOSTBYNAME_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETHOSTBYNAME_R)
- CHECK_FUNCTION_EXISTS_D(gethostbyname_r HAVE_GETHOSTBYNAME_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(gethostbyname_r HAVE_GETHOSTBYNAME_R)
IF(HAVE_GETHOSTBYNAME_R)
SET(HAVE_GETHOSTBYNAME_R_6_SRC "
#include <netdb.h>
@@ -627,7 +627,7 @@
# SC_TCL_GETPWUID_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETPWUID_R)
- CHECK_FUNCTION_EXISTS_D(getpwuid_r HAVE_GETPWUID_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(getpwuid_r HAVE_GETPWUID_R)
IF(HAVE_GETPWUID_R)
SET(HAVE_GETPWUID_R_5_SRC "
#include <sys/types.h>
@@ -669,7 +669,7 @@
# SC_TCL_GETPWNAM_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETPWNAM_R)
- CHECK_FUNCTION_EXISTS_D(getpwnam_r HAVE_GETPWNAM_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(getpwnam_r HAVE_GETPWNAM_R)
IF(HAVE_GETPWNAM_R)
SET(HAVE_GETPWNAM_R_5_SRC "
#include <sys/types.h>
@@ -711,7 +711,7 @@
# SC_TCL_GETGRGID_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETGRGID_R)
- CHECK_FUNCTION_EXISTS_D(getgrgid_r HAVE_GETGRGID_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(getgrgid_r HAVE_GETGRGID_R)
IF(HAVE_GETGRGID_R)
SET(HAVE_GETGRGID_R_5_SRC "
#include <sys/types.h>
@@ -753,7 +753,7 @@
# SC_TCL_GETGRNAM_R
#--------------------------------------------------------------------
MACRO(SC_TCL_GETGRNAM_R)
- CHECK_FUNCTION_EXISTS_D(getgrnam_r HAVE_GETGRNAM_R)
+ CONFIG_CHECK_FUNCTION_EXISTS(getgrnam_r HAVE_GETGRNAM_R)
IF(HAVE_GETGRNAM_R)
SET(HAVE_GETGRNAM_R_5_SRC "
#include <sys/types.h>
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-11-05 19:52:31 UTC
(rev 41254)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-11-05 20:08:23 UTC
(rev 41255)
@@ -48,6 +48,7 @@
# set local CFLAGS name
SET(CFLAGS_NAME TCL)
SET(TCL_CFLAGS "")
+SET(CONFIG_CFLAGS TCL_CFLAGS)
# build shared libs by default
OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
@@ -172,30 +173,30 @@
ENDIF(WORDS_BIGENDIAN)
# POSIX substitutes
-CHECK_FUNCTION_EXISTS_D(getcwd HAVE_GETCWD)
+CONFIG_CHECK_FUNCTION_EXISTS(getcwd HAVE_GETCWD)
IF(NOT HAVE_GETCWD)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DUSEGETWD=1")
ENDIF(NOT HAVE_GETCWD)
IF(NOT HAVE_GETCWD)
- CHECK_FUNCTION_EXISTS_D(getwd HAVE_GETWD)
+ CONFIG_CHECK_FUNCTION_EXISTS(getwd HAVE_GETWD)
IF(NOT HAVE_GETWD)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_GETWD=1")
ENDIF(NOT HAVE_GETWD)
ENDIF(NOT HAVE_GETCWD)
-CHECK_FUNCTION_EXISTS_D(opendir HAVE_OPENDIR)
+CONFIG_CHECK_FUNCTION_EXISTS(opendir HAVE_OPENDIR)
IF(NOT HAVE_OPENDIR)
SET(COMPAT_SRCS ${COMPAT_SRCS} compat/opendir.c)
ADD_TCL_CFLAG(USE_DIRENT2_H)
ENDIF(NOT HAVE_OPENDIR)
-CHECK_FUNCTION_EXISTS_D(strtol HAVE_STRTOL)
+CONFIG_CHECK_FUNCTION_EXISTS(strtol HAVE_STRTOL)
IF(NOT HAVE_STRTOL)
SET(COMPAT_SRCS ${COMPAT_SRCS} compat/strtol.c)
ENDIF(NOT HAVE_STRTOL)
-CHECK_FUNCTION_EXISTS_D(waitpid HAVE_WAITPID)
+CONFIG_CHECK_FUNCTION_EXISTS(waitpid HAVE_WAITPID)
IF(NOT HAVE_WAITPID)
SET(COMPAT_SRCS ${COMPAT_SRCS} compat/waitpid.c)
ENDIF(NOT HAVE_WAITPID)
-CHECK_FUNCTION_EXISTS_D(strerror HAVE_STRERROR)
+CONFIG_CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
IF(NOT HAVE_STRERROR)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_STRERROR=1")
ENDIF(NOT HAVE_STRERROR)
@@ -203,7 +204,7 @@
IF(NOT HAVE_WAIT3)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_WAIT3=1")
ENDIF(NOT HAVE_WAIT3)
-CHECK_FUNCTION_EXISTS_D(uname HAVE_UNAME)
+CONFIG_CHECK_FUNCTION_EXISTS(uname HAVE_UNAME)
IF(NOT HAVE_UNAME)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_UNAME=1")
ENDIF(NOT HAVE_UNAME)
@@ -297,31 +298,31 @@
# Check for types - TODO: still need to define substitutes if these
# are not found
-CHECK_TYPE_SIZE_D(mode_t MODE)
-CHECK_TYPE_SIZE_D(pid_t PID)
-CHECK_TYPE_SIZE_D(size_t SIZE)
-CHECK_TYPE_SIZE_D(uid_t UID)
-CHECK_TYPE_SIZE_D(blkcnt_t BLKCNT)
-CHECK_TYPE_SIZE_D(intptr_t INTPTR)
-CHECK_TYPE_SIZE_D(uintptr_t UINTPTR)
+CONFIG_CHECK_TYPE_SIZE(mode_t MODE)
+CONFIG_CHECK_TYPE_SIZE(pid_t PID)
+CONFIG_CHECK_TYPE_SIZE(size_t SIZE)
+CONFIG_CHECK_TYPE_SIZE(uid_t UID)
+CONFIG_CHECK_TYPE_SIZE(blkcnt_t BLKCNT)
+CONFIG_CHECK_TYPE_SIZE(intptr_t INTPTR)
+CONFIG_CHECK_TYPE_SIZE(uintptr_t UINTPTR)
SC_ENABLE_LANGINFO()
IF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
- CHECK_FUNCTION_EXISTS_D(getattrlist HAVE_GETATTRLIST)
- CHECK_INCLUDE_FILE_D(copyfile.h HAVE_COPYFILE_H)
- CHECK_FUNCTION_EXISTS_D(copyfile HAVE_COPYFILE)
+ CONFIG_CHECK_FUNCTION_EXISTS(getattrlist HAVE_GETATTRLIST)
+ CONFIG_CHECK_INCLUDE_FILE(copyfile.h HAVE_COPYFILE_H)
+ CONFIG_CHECK_FUNCTION_EXISTS(copyfile HAVE_COPYFILE)
IF(${COREFOUNDATION_FRAMEWORK})
- CHECK_INCLUDE_FILE_D(libkern/OSAtomic.h HAVE_LIBKERN_OSATOMIC_H)
- CHECK_FUNCTION_EXISTS_D(OSSpinLockLock HAVE_OSSPINLOCKLOCK)
- CHECK_FUNCTION_EXISTS_D(pthread_atfork HAVE_PTHREAD_ATFORK)
+ CONFIG_CHECK_INCLUDE_FILE(libkern/OSAtomic.h
HAVE_LIBKERN_OSATOMIC_H)
+ CONFIG_CHECK_FUNCTION_EXISTS(OSSpinLockLock HAVE_OSSPINLOCKLOCK)
+ CONFIG_CHECK_FUNCTION_EXISTS(pthread_atfork HAVE_PTHREAD_ATFORK)
ENDIF(${COREFOUNDATION_FRAMEWORK})
ADD_TCL_CFLAG(USE_VFORK)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DTCL_DEFAULT_ENCODING=\\\"utf-8\\\"")
ADD_TCL_CFLAG(TCL_LOAD_FROM_MEMORY)
ADD_TCL_CFLAG(TCL_WIDE_CLICKS)
- CHECK_INCLUDE_FILE_USABILITY_D(AvailabilityMacros.h
HAVE_AVAILABILITYMACROS_H)
+ CONFIG_CHECK_INCLUDE_FILE_USABILITY(AvailabilityMacros.h
HAVE_AVAILABILITYMACROS_H)
IF(HAVE_AVAILABILITYMACROS_H)
SET(WEAK_IMPORT_SRCS "
#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
@@ -407,33 +408,33 @@
ADD_TCL_CFLAG(TCL_STACK_GROWS_UP)
ENDIF(STACK_GROWS_UP)
-CHECK_INCLUDE_FILE_D(sys/types.h HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE_D(sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILE_D(sys/fstatfs.h HAVE_SYS_FSTATFS_H)
+CONFIG_CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
+CONFIG_CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
+CONFIG_CHECK_INCLUDE_FILE(sys/fstatfs.h HAVE_SYS_FSTATFS_H)
IF(NOT HAVE_SYS_FSTATFS_H)
SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_FSTATFS=1")
ENDIF(NOT HAVE_SYS_FSTATFS_H)
-CHECK_INCLUDE_FILE_D(memory.h HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE_D(strings.h HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE_D(inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE_D(stdint.h HAVE_STDINT_H)
-CHECK_INCLUDE_FILE_D(unistd.h HAVE_UNISTD_H)
+CONFIG_CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H)
+CONFIG_CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
+CONFIG_CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
+CONFIG_CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
+CONFIG_CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
CHECK_COMPILER_SUPPORTS_HIDDEN_D()
-CHECK_LIBRARY(DL dl dlopen)
+CONFIG_CHECK_LIBRARY(DL dl dlopen)
-CHECK_INCLUDE_FILE_USABILITY_D(sys/modem.h SYS_MODEM_H)
+CONFIG_CHECK_INCLUDE_FILE_USABILITY(sys/modem.h SYS_MODEM_H)
CHECK_FD_SET_IN_TYPES_D()
-CHECK_FUNCTION_EXISTS_D(chflags HAVE_CHFLAGS)
+CONFIG_CHECK_FUNCTION_EXISTS(chflags HAVE_CHFLAGS)
IF(COMPAT_SRCS)
ADD_TCL_CFLAG(USE_COMPAT)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
