Revision: 38933
http://brlcad.svn.sourceforge.net/brlcad/?rev=38933&view=rev
Author: starseeker
Date: 2010-05-01 00:03:32 +0000 (Sat, 01 May 2010)
Log Message:
-----------
Attempt at merging in the necessary BRL-CAD changes not incorporated into
tcl/tk 8.5.8
Modified Paths:
--------------
brlcad/trunk/src/other/tcl/generic/tcl.h
brlcad/trunk/src/other/tcl/generic/tclInt.h
brlcad/trunk/src/other/tcl/generic/tclProc.c
brlcad/trunk/src/other/tcl/unix/Makefile.in
brlcad/trunk/src/other/tcl/unix/configure.in
brlcad/trunk/src/other/tcl/unix/tcl.m4
brlcad/trunk/src/other/tcl/win/configure.in
brlcad/trunk/src/other/tcl/win/tclWinPort.h
brlcad/trunk/src/other/tk/library/panedwindow.tcl
brlcad/trunk/src/other/tk/unix/Makefile.in
brlcad/trunk/src/other/tk/unix/tcl.m4
brlcad/trunk/src/other/tk/win/tkWinPort.h
Modified: brlcad/trunk/src/other/tcl/generic/tcl.h
===================================================================
--- brlcad/trunk/src/other/tcl/generic/tcl.h 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tcl/generic/tcl.h 2010-05-01 00:03:32 UTC (rev
38933)
@@ -92,6 +92,12 @@
# endif
#endif /* __WIN32__ */
+/* quell shadow warnings */
+#ifdef index
+# undef index
+#endif
+#define index tcl_scoped_index
+
/*
* Utility macros: STRINGIFY takes an argument and wraps it in "" (double
* quotation marks), JOIN joins two arguments.
@@ -175,7 +181,7 @@
# ifdef STATIC_BUILD
# define DLLIMPORT
# define DLLEXPORT
-# ifdef _DLL
+# if (defined(HAVE_DECLSPEC) && defined(_DLL))
# define CRTIMPORT __declspec(dllimport)
# else
# define CRTIMPORT
@@ -195,6 +201,10 @@
# define CRTIMPORT
#endif
+#ifndef HAVE_DECLSPEC
+# define HAVE_DECLSPEC 0
+#endif
+
/*
* These macros are used to control whether functions are being declared for
* import or export. If a function is being declared while it is being built
@@ -2435,6 +2445,9 @@
* end block for C++
*/
+/* quell shadow warnings */
+#undef index
+
#ifdef __cplusplus
}
#endif
Modified: brlcad/trunk/src/other/tcl/generic/tclInt.h
===================================================================
--- brlcad/trunk/src/other/tcl/generic/tclInt.h 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tcl/generic/tclInt.h 2010-05-01 00:03:32 UTC (rev
38933)
@@ -3948,6 +3948,8 @@
#include "tclIntPlatDecls.h"
#include "tclTomMathDecls.h"
+#include "../../../../include/common.h"
+
#endif /* _TCLINT */
/*
Modified: brlcad/trunk/src/other/tcl/generic/tclProc.c
===================================================================
--- brlcad/trunk/src/other/tcl/generic/tclProc.c 2010-04-30 23:19:59 UTC
(rev 38932)
+++ brlcad/trunk/src/other/tcl/generic/tclProc.c 2010-05-01 00:03:32 UTC
(rev 38933)
@@ -1162,9 +1162,9 @@
ByteCode *codePtr;
bodyPtr = framePtr->procPtr->bodyPtr;
- if (bodyPtr->typePtr != &tclByteCodeType) {
+ /*if (bodyPtr->typePtr != &tclByteCodeType) {
Tcl_Panic("body object for proc attached to frame is not a byte code
type");
- }
+ }*/
codePtr = bodyPtr->internalRep.otherValuePtr;
if (framePtr->numCompiledLocals) {
Modified: brlcad/trunk/src/other/tcl/unix/Makefile.in
===================================================================
--- brlcad/trunk/src/other/tcl/unix/Makefile.in 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tcl/unix/Makefile.in 2010-05-01 00:03:32 UTC (rev
38933)
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id$
+# RCS @(#) $Id$
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -80,9 +80,6 @@
# Directory in which to install html documentation:
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
-# Directory in which to install the configuration file tclConfig.sh
-CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
-
# Package search path.
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
@@ -153,9 +150,9 @@
INSTALL_STRIP_LIBRARY = -S -x
INSTALL = @srcdir@/../unix/install-sh -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_LIBRARY = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL} -m 775
+INSTALL_LIBRARY = ${INSTALL} -m 775
+INSTALL_DATA = ${INSTALL} -m 664
# TCL_EXE is the name of a tclsh executable that is available *BEFORE* running
# make for the first time. Certain build targets (make genstubs) need it to be
@@ -536,8 +533,10 @@
# won't compile on the current machine, and they will cause problems for
# things like "make depend".
+PLAT_SOURCES = @PLAT_SRCS@
+
SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
- $(STUB_SRCS) @PLAT_SRCS@
+ $(STUB_SRCS) $(PLAT_SOURCES)
all: binaries libraries doc
@@ -552,10 +551,20 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f $@
@MAKE_LIB@
+ @if test -f $(LIB_FILE) ; then \
+ if test ! -f libtcl$(SHLIB_SUFFIX) ; then \
+ ln -s $(LIB_FILE) libtcl$(SHLIB_SUFFIX) ; \
+ fi ; \
+ fi
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
+ @if test -f $(STUB_LIB_FILE) ; then \
+ if test ! -f libtclstub.a ; then \
+ ln -s $(STUB_LIB_FILE) libtclstub.a ; \
+ fi ; \
+ fi
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
@@ -714,13 +723,12 @@
# (e.g. if installing as root).
install-binaries: binaries
- @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
- "$(CONFIG_INSTALL_DIR)"; \
+ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" ; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@@ -729,7 +737,11 @@
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
+ @chmod 775 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
+ @if test -f libtcl$(SHLIB_SUFFIX) ; then \
+ $(INSTALL_LIBRARY) libtcl$(SHLIB_SUFFIX)
$(LIB_INSTALL_DIR)/libtcl$(SHLIB_SUFFIX);\
+ chmod 775 $(LIB_INSTALL_DIR)/libtcl$(SHLIB_SUFFIX) ; \
+ fi
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -737,11 +749,18 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
- @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
+ @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh"
+ @$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh
+ @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
+ @$(INSTALL_DATA) tclConfig.sh "$(LIB_INSTALL_DIR)"/tclConfig.sh
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
+ chmod 775 $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; \
+ if test -f libtclstub.a ; then \
+ $(INSTALL_LIBRARY) libtclstub.a $(LIB_INSTALL_DIR)/libtclstub.a
; \
+ chmod 775 $(LIB_INSTALL_DIR)/libtclstub.a ; \
+ fi ; \
fi
@EXTRA_INSTALL_BINARIES@
@@ -751,7 +770,7 @@
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@@ -760,7 +779,7 @@
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
mkdir -p "$(SCRIPT_INSTALL_DIR)"/$$i; \
- chmod 755 "$(SCRIPT_INSTALL_DIR)"/$$i; \
+ chmod 775 "$(SCRIPT_INSTALL_DIR)"/$$i; \
else true; \
fi; \
done;
@@ -777,7 +796,7 @@
done;
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
- $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
+ $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
done;
@@ -786,8 +805,8 @@
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
- @echo "Installing package http 2.7.5 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.5.tm;
+ @echo "Installing package http 2.7.2 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.2.tm;
@echo "Installing library opt0.4 directory";
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -795,11 +814,11 @@
done;
@echo "Installing package msgcat 1.4.2 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm;
- @echo "Installing package tcltest 2.3.2 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.2.tm;
+ @echo "Installing package tcltest 2.3.0 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.0.tm;
- @echo "Installing package platform 1.0.5 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.5.tm;
+ @echo "Installing package platform 1.0.3 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.3.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
@@ -828,28 +847,31 @@
$(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
install-doc: doc
+ @if test ! -x $(UNIX_DIR)/installManPage; then \
+ chmod +x $(UNIX_DIR)/installManPage; \
+ fi
@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)"
"$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i
"$(MAN1_INSTALL_DIR)"; \
+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage
$(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN1_INSTALL_DIR); \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i
"$(MAN3_INSTALL_DIR)"; \
+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage
$(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN3_INSTALL_DIR); \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i
"$(MANN_INSTALL_DIR)"; \
+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage
$(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MANN_INSTALL_DIR); \
done
# Optional target to install private headers
@@ -859,7 +881,7 @@
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@@ -1630,7 +1652,7 @@
$(DISTDIR)/unix
chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
chmod 775 $(DISTDIR)/unix/ldAix
- chmod +x $(DISTDIR)/unix/install-sh
+ chmod 775 $(DISTDIR)/unix/install-sh
mkdir $(DISTDIR)/generic
cp -p $(GENERIC_DIR)/*.[cdh] $(DISTDIR)/generic
cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
@@ -1816,7 +1838,7 @@
mkdir -p $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin
sed -e "s/TCLVERSION/$(VERSION)/g" < $(UNIX_DIR)/tclsh.sh \
> $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin/tclsh$(VERSION)
- chmod 755 $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin/tclsh$(VERSION)
+ chmod 775 $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin/tclsh$(VERSION)
#
# Build and install the architecture specific files in the dist directory.
@@ -1845,4 +1867,16 @@
pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
rm -rf $(PACKAGE)
+.PHONY: all binaries libraries doc tclLibObjs objs test gdb-test runtest \
+ ro-test shell gdb ddd valgrind valgrindshell topDirName gendate \
+ dltest.marker $(INSTALL_TARGETS) install install-strip \
+ install-tzdata install-msgs install-private-headers clean distclean \
+ depend genstubs checkstubs checkdoc checkuchar checkexports rpm dist \
+ alldist allpatch html html-tcl html-tk package package-config \
+ package-common package-binaries package-generate
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: brlcad/trunk/src/other/tcl/unix/configure.in
===================================================================
--- brlcad/trunk/src/other/tcl/unix/configure.in 2010-04-30 23:19:59 UTC
(rev 38932)
+++ brlcad/trunk/src/other/tcl/unix/configure.in 2010-05-01 00:03:32 UTC
(rev 38933)
@@ -6,7 +6,7 @@
# RCS: @(#) $Id$
AC_INIT([tcl],[8.5])
-AC_PREREQ(2.59)
+AC_PREREQ(2.52)
dnl This is only used when included from macosx/configure.ac
m4_ifdef([SC_USE_CONFIG_HEADERS], [
@@ -755,6 +755,9 @@
TCL_YEAR="`date +%Y`"
fi
+EXTRA_INSTALL_BINARIES=":"
+EXTRA_BUILD_HTML=":"
+
if test "$FRAMEWORK_BUILD" = "1" ; then
AC_DEFINE(TCL_FRAMEWORK, 1, [Is Tcl built as a framework?])
# Construct a fake local framework structure to make linking with
Modified: brlcad/trunk/src/other/tcl/unix/tcl.m4
===================================================================
--- brlcad/trunk/src/other/tcl/unix/tcl.m4 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tcl/unix/tcl.m4 2010-05-01 00:03:32 UTC (rev
38933)
@@ -1121,8 +1121,6 @@
AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
# Require ranlib early so we can override it in special cases below.
- LDAIX_SRC=""
- AS_IF([test x"${SHLIB_VERSION}" = x], [SHLIB_VERSION="1.0"])
AC_REQUIRE([AC_PROG_RANLIB])
@@ -1142,7 +1140,8 @@
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
AS_IF([test "$GCC" = yes], [
- CFLAGS_WARNING="-Wall"
+# CFLAGS_WARNING="-Wall -Wno-implicit-int"
+ CFLAGS_WARNING="-w"
], [CFLAGS_WARNING=""])
TCL_NEEDS_EXP_FILE=0
TCL_BUILD_EXP_FILE=""
@@ -1162,12 +1161,11 @@
AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [
# AIX requires the _r compiler when gcc isn't being used
case "${CC}" in
- *_r|*_r\ *)
+ *_r)
# ok ...
;;
*)
- # Make sure only first arg gets _r
- CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
+ CC=${CC}_r
;;
esac
AC_MSG_RESULT([Using $CC for compiling with threads])
@@ -1183,7 +1181,6 @@
LD_LIBRARY_PATH_VAR="LIBPATH"
# Check to enable 64-bit flags for compiler/linker on AIX 4+
- LDAIX_SRC='$(UNIX_DIR)/ldAix'
AS_IF([test "$do64bit" = yes -a "`uname -v`" -gt 3], [
AS_IF([test "$GCC" = yes], [
AC_MSG_WARN([64bit mode not supported with GCC on $system])
@@ -1290,6 +1287,16 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
+ Haiku*)
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-lroot"
+ AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"])
+ ;;
HP-UX-*.11.*)
# Use updated header definitions where possible
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN
network library?])
@@ -1525,7 +1532,7 @@
AS_IF([test $tcl_cv_ld_elf = yes], [
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
], [
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
])
# Ancient FreeBSD doesn't handle version numbers with dots.
@@ -1534,7 +1541,6 @@
TCL_LIB_VERSIONS_OK=nodots
;;
OpenBSD-*)
- CFLAGS_OPTIMIZE='-O2'
SHLIB_CFLAGS="-fPIC"
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
SHLIB_LD_LIBS='${LIBS}'
@@ -1544,7 +1550,7 @@
AS_IF([test $doRpath = yes], [
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
AC_EGREP_CPP(yes, [
#ifdef __ELF__
@@ -1670,6 +1676,7 @@
LD_SEARCH_FLAGS=""
LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
AC_DEFINE(MAC_OSX_TCL, 1, [Is this a Mac I see before me?])
+ AC_DEFINE(MODULE_SCOPE, extern, [module scope is visible])
PLAT_OBJS='${MAC_OSX_OBJS}'
PLAT_SRCS='${MAC_OSX_SRCS}'
AC_MSG_CHECKING([whether to use CoreFoundation])
@@ -1853,7 +1860,7 @@
# requires an extra version number at the end of .so file names.
# So, the library has to have a name like libtcl75.so.1.0
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -2117,7 +2124,6 @@
AC_SUBST(DL_OBJS)
AC_SUBST(PLAT_OBJS)
AC_SUBST(PLAT_SRCS)
- AC_SUBST(LDAIX_SRC)
AC_SUBST(CFLAGS)
AC_SUBST(CFLAGS_DEBUG)
AC_SUBST(CFLAGS_OPTIMIZE)
@@ -3012,7 +3018,7 @@
#--------------------------------------------------------------------
# SC_TCL_GETADDRINFO
#
-# Check if we have 'getaddrinfo' for hostname lookup and inet6/ipv6
+# Check if we have 'getaddrinfo'
#
# Arguments:
# None
Modified: brlcad/trunk/src/other/tcl/win/configure.in
===================================================================
--- brlcad/trunk/src/other/tcl/win/configure.in 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tcl/win/configure.in 2010-05-01 00:03:32 UTC (rev
38933)
@@ -6,7 +6,7 @@
# RCS: @(#) $Id$
AC_INIT(../generic/tcl.h)
-AC_PREREQ(2.59)
+AC_PREREQ(2.52)
# The following define is needed when building with Cygwin since newer
# versions of autoconf incorrectly set SHELL to /bin/bash instead of
Modified: brlcad/trunk/src/other/tcl/win/tclWinPort.h
===================================================================
--- brlcad/trunk/src/other/tcl/win/tclWinPort.h 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tcl/win/tclWinPort.h 2010-05-01 00:03:32 UTC (rev
38933)
@@ -47,10 +47,13 @@
/*
* These string functions are not defined with the same names on Windows.
*/
+#ifndef strcasecmp
+# define strcasecmp stricmp
+#endif
+#ifndef strncasecmp
+# define strncasecmp strnicmp
+#endif
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-
/*
* Need to block out these includes for building extensions with MetroWerks
* compiler for Win32.
@@ -72,6 +75,10 @@
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
+#ifdef INCL_WINSOCK_API_TYPEDEFS
+#undef INCL_WINSOCK_API_TYPEDEFS
+#endif
+
/*
* Ask for the winsock function typedefs, also.
*/
Modified: brlcad/trunk/src/other/tk/library/panedwindow.tcl
===================================================================
--- brlcad/trunk/src/other/tk/library/panedwindow.tcl 2010-04-30 23:19:59 UTC
(rev 38932)
+++ brlcad/trunk/src/other/tk/library/panedwindow.tcl 2010-05-01 00:03:32 UTC
(rev 38933)
@@ -39,7 +39,9 @@
if {[$w cget -opaqueresize]} {
set proxy 0
}
- set what [$w identify $x $y]
+ if {[catch {$w identify $x $y} what]} {
+ return
+ }
if { [llength $what] == 2 } {
lassign $what index which
if {!$::tk_strictMotif || $which eq "handle"} {
@@ -123,7 +125,9 @@
#
proc ::tk::panedwindow::Motion {w x y} {
variable ::tk::Priv
- set id [$w identify $x $y]
+ if {[catch {$w identify $x $y} id]} {
+ return
+ }
if {([llength $id] == 2) && \
(!$::tk_strictMotif || [lindex $id 1] eq "handle")} {
if {![info exists Priv($w,panecursor)]} {
Modified: brlcad/trunk/src/other/tk/unix/Makefile.in
===================================================================
--- brlcad/trunk/src/other/tk/unix/Makefile.in 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tk/unix/Makefile.in 2010-05-01 00:03:32 UTC (rev
38933)
@@ -92,12 +92,6 @@
# Directory in which to install html documentation:
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
-# Directory in which to install the configuration file tkConfig.sh:
-CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
-
-# Directory in which to install the demo files:
-DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos
-
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
@@ -193,7 +187,7 @@
# Some versions of make, like SGI's, use the following variable to
# determine which shell to use for executing commands:
-SHELL = @SHELL@
+SHELL = /bin/sh
# BUILD_TCLSH is the fully qualified path name of the tclsh shell
# in the Tcl build directory. Test that need to be run in the
@@ -219,9 +213,9 @@
INSTALL_STRIP_LIBRARY = -S -x
INSTALL = @srcdir@/install-sh -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_LIBRARY = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL} -m 775
+INSTALL_LIBRARY = ${INSTALL} -m 775
+INSTALL_DATA = ${INSTALL} -m 664
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
@@ -275,6 +269,8 @@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
+SHLIB_SUFFIX = @SHLIB_SUFFIX@
+
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
# with cc, and the second is for use when running ld directly.
@@ -556,7 +552,7 @@
$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
$(TTK_HDRS) $(@tk_windowingsys...@_private_hdrs)
-DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
+DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
SHELL_ENV = \
@ld_library_path_...@="`pwd`:${TCL_BIN_DIR}:$...@ld_library_path_var@}"; \
@@ -566,12 +562,12 @@
all: binaries libraries doc
-binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
+binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
libraries:
$(TOP_DIR)/doc/man.macros:
- chmod +x $(UNIX_DIR)/install-sh
+ chmod 775 $(UNIX_DIR)/install-sh
$(INSTALL_DATA) @TCL_SRC_DIR@/doc/man.macros $(TOP_DIR)/doc/man.macros
doc: $(TOP_DIR)/doc/man.macros
@@ -581,10 +577,20 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
rm -f $@
@MAKE_LIB@
+ @if test -f $(LIB_FILE) ; then \
+ if test ! -f libtk$(SHLIB_SUFFIX) ; then \
+ ln -s $(LIB_FILE) libtk$(SHLIB_SUFFIX) ; \
+ fi;\
+ fi
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
+ @if test -f $(STUB_LIB_FILE) ; then \
+ if test ! -f libtkstub.a ; then \
+ ln -s $(STUB_LIB_FILE) libtkstub.a ; \
+ fi;\
+ fi
# Build Aqua resource files
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
@@ -641,6 +647,7 @@
# % make test TESTFLAGS="-verbose bps -file fileName.test"
test: test-classic test-ttk
+ @
test-classic: tktest
$(SHELL_ENV) ./tktest $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
@@ -693,13 +700,12 @@
# possible (e.g. if installing as root).
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
- @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
- "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
+ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)"
"$(PKG_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@@ -710,7 +716,7 @@
echo "Creating package index $(PKG_INDEX)"; \
rm -f "$(PKG_INDEX)"; \
(\
- echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
+ echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for
(f in a) {print ".."}}'`;\
echo "package ifneeded Tk
$(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
@@ -718,7 +724,11 @@
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
+ @chmod 775 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
+ if test -f libtk$(SHLIB_SUFFIX) ; then \
+ $(INSTALL_LIBRARY) libtk$(SHLIB_SUFFIX)
$(LIB_INSTALL_DIR)/libtk$(SHLIB_SUFFIX);\
+ chmod 775 $(LIB_INSTALL_DIR)/libtk$(SHLIB_SUFFIX) ; \
+ fi
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
@@ -726,11 +736,18 @@
fi
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
@$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
- @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
- @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tkConfig.sh
+ @echo "Installing wish as $(BIN_INSTALL_DIR)/wish"
+ @$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish
+ @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
+ @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
+ chmod 775 $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; \
+ if test -f libtkstub.a ; then \
+ $(INSTALL_LIBRARY) libtkstub.a $(LIB_INSTALL_DIR)/libtkstub.a ;
\
+ chmod 775 $(LIB_INSTALL_DIR)/libtkstub.a ; \
+ fi;\
fi
@EXTRA_INSTALL_BINARIES@
@@ -744,7 +761,7 @@
if [ -n "$$i" -a ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@@ -761,7 +778,7 @@
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
done;
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
- @for i in $(TOP_DIR)/library/*.tcl \
+ @for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
$(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
@@ -789,58 +806,63 @@
done;
install-demos:
- @for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)"/images ; \
+ @for i in "$(SCRIPT_INSTALL_DIR)" \
+ "$(SCRIPT_INSTALL_DIR)"/demos \
+ "$(SCRIPT_INSTALL_DIR)"/demos/images ; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
- @echo "Installing demos to $(DEMO_INSTALL_DIR)/";
+ @echo "Installing demos to $(SCRIPT_INSTALL_DIR)/demos/";
@for i in $(TOP_DIR)/library/demos/*; \
do \
if [ -f $$i ] ; then \
sed -e '3 s|exec wish|exec wish$(VERSION)|' \
- $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
+ $$i > "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \
fi; \
done;
@for i in $(DEMOPROGS); \
do \
- chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \
+ chmod 775 "$(SCRIPT_INSTALL_DIR)"/demos/$$i; \
done;
@echo "Installing demo images";
@for i in $(TOP_DIR)/library/demos/images/*; \
do \
if [ -f $$i ] ; then \
- $(INSTALL_DATA) $$i "$(DEMO_INSTALL_DIR)"/images; \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/demos/images; \
fi; \
done;
install-doc:
+ @if test ! -x $(UNIX_DIR)/installManPage; then \
+ chmod +x $(UNIX_DIR)/installManPage; \
+ fi
@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)"
"$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i
"$(MAN1_INSTALL_DIR)"; \
+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage
$(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN1_INSTALL_DIR); \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i
"$(MAN3_INSTALL_DIR)"; \
+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage
$(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN3_INSTALL_DIR); \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i
"$(MANN_INSTALL_DIR)"; \
+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage
$(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MANN_INSTALL_DIR); \
done
# Optional target to install private headers
@@ -850,7 +872,7 @@
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
mkdir -p "$$i"; \
- chmod 755 "$$i"; \
+ chmod 775 "$$i"; \
else true; \
fi; \
done;
@@ -1516,7 +1538,7 @@
$(UNIX_DIR)/README $(UNIX_DIR)/installManPage \
$(UNIX_DIR)/tkConfig.h.in $(DISTDIR)/unix
chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
- chmod +x $(DISTDIR)/unix/install-sh
+ chmod 775 $(DISTDIR)/unix/install-sh
mkdir $(DISTDIR)/bitmaps
@(cd $(TOP_DIR); for i in bitmaps/* ; do \
if [ -f $$i ] ; then \
@@ -1525,7 +1547,7 @@
fi; \
done;)
mkdir $(DISTDIR)/generic
- cp -p $(GENERIC_DIR)/*.[ch] $(DISTDIR)/generic
+ cp -p $(GENERIC_DIR)/*.[ch] $(GENERIC_DIR)/prolog.ps $(DISTDIR)/generic
cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog \
@@ -1731,7 +1753,7 @@
sed -e "s/TCLVERSION/$(TCLVERSION)/g" \
-e "s/TKVERSION/$(VERSION)/g" < $(UNIX_DIR)/wish.sh \
> $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)
- chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)
+ chmod 775 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)
#
# Build and install the architecture specific files in the dist directory.
Modified: brlcad/trunk/src/other/tk/unix/tcl.m4
===================================================================
--- brlcad/trunk/src/other/tk/unix/tcl.m4 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tk/unix/tcl.m4 2010-05-01 00:03:32 UTC (rev
38933)
@@ -1121,8 +1121,6 @@
AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
# Require ranlib early so we can override it in special cases below.
- LDAIX_SRC=""
- AS_IF([test x"${SHLIB_VERSION}" = x], [SHLIB_VERSION="1.0"])
AC_REQUIRE([AC_PROG_RANLIB])
@@ -1142,7 +1140,8 @@
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
AS_IF([test "$GCC" = yes], [
- CFLAGS_WARNING="-Wall"
+# CFLAGS_WARNING="-Wall -Wno-implicit-int"
+ CFLAGS_WARNING="-w"
], [CFLAGS_WARNING=""])
TCL_NEEDS_EXP_FILE=0
TCL_BUILD_EXP_FILE=""
@@ -1162,12 +1161,11 @@
AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [
# AIX requires the _r compiler when gcc isn't being used
case "${CC}" in
- *_r|*_r\ *)
+ *_r)
# ok ...
;;
*)
- # Make sure only first arg gets _r
- CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
+ CC=${CC}_r
;;
esac
AC_MSG_RESULT([Using $CC for compiling with threads])
@@ -1183,7 +1181,6 @@
LD_LIBRARY_PATH_VAR="LIBPATH"
# Check to enable 64-bit flags for compiler/linker on AIX 4+
- LDAIX_SRC='$(UNIX_DIR)/ldAix'
AS_IF([test "$do64bit" = yes -a "`uname -v`" -gt 3], [
AS_IF([test "$GCC" = yes], [
AC_MSG_WARN([64bit mode not supported with GCC on $system])
@@ -1290,6 +1287,16 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
+ Haiku*)
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-lroot"
+ AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"])
+ ;;
HP-UX-*.11.*)
# Use updated header definitions where possible
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN
network library?])
@@ -1525,7 +1532,7 @@
AS_IF([test $tcl_cv_ld_elf = yes], [
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
], [
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
])
# Ancient FreeBSD doesn't handle version numbers with dots.
@@ -1534,7 +1541,6 @@
TCL_LIB_VERSIONS_OK=nodots
;;
OpenBSD-*)
- CFLAGS_OPTIMIZE='-O2'
SHLIB_CFLAGS="-fPIC"
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
SHLIB_LD_LIBS='${LIBS}'
@@ -1544,7 +1550,7 @@
AS_IF([test $doRpath = yes], [
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
AC_EGREP_CPP(yes, [
#ifdef __ELF__
@@ -1670,6 +1676,7 @@
LD_SEARCH_FLAGS=""
LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
AC_DEFINE(MAC_OSX_TCL, 1, [Is this a Mac I see before me?])
+ AC_DEFINE(MODULE_SCOPE, extern, [module scope is visible])
PLAT_OBJS='${MAC_OSX_OBJS}'
PLAT_SRCS='${MAC_OSX_SRCS}'
AC_MSG_CHECKING([whether to use CoreFoundation])
@@ -1853,7 +1860,7 @@
# requires an extra version number at the end of .so file names.
# So, the library has to have a name like libtcl75.so.1.0
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -2117,7 +2124,6 @@
AC_SUBST(DL_OBJS)
AC_SUBST(PLAT_OBJS)
AC_SUBST(PLAT_SRCS)
- AC_SUBST(LDAIX_SRC)
AC_SUBST(CFLAGS)
AC_SUBST(CFLAGS_DEBUG)
AC_SUBST(CFLAGS_OPTIMIZE)
@@ -3012,7 +3018,7 @@
#--------------------------------------------------------------------
# SC_TCL_GETADDRINFO
#
-# Check if we have 'getaddrinfo' for hostname lookup and inet6/ipv6
+# Check if we have 'getaddrinfo'
#
# Arguments:
# None
Modified: brlcad/trunk/src/other/tk/win/tkWinPort.h
===================================================================
--- brlcad/trunk/src/other/tk/win/tkWinPort.h 2010-04-30 23:19:59 UTC (rev
38932)
+++ brlcad/trunk/src/other/tk/win/tkWinPort.h 2010-05-01 00:03:32 UTC (rev
38933)
@@ -49,7 +49,9 @@
#endif
#ifdef _MSC_VER
-# define hypot _hypot
+# ifndef hypot
+# define hypot _hypot
+# endif
#endif /* _MSC_VER */
#ifndef __GNUC__
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
