From 9ac61d2a0122062c25c3ad97defae9cbaa59b57f Mon Sep 17 00:00:00 2001 From: das Date: Sat, 31 Aug 2002 06:09:45 +0000 Subject: *** macosx-8-4-branch merged into the mainline [tcl patch #602770] *** * generic/tcl.decls: added new macosx specific entry to stubs table. * tools/genStubs.tcl: added generation of platform guards for macosx. This is a little more complex than it seems, because MacOS X IS "unix" plus a little bit, for the purposes of Tcl. BUT unfortunately, Tk uses "unix" to mean X11. So added platform keys for macosx (the little added to "unix"), "aqua" and "x11" to distinguish these for Tk. * generic/tcl.h: added a #ifnded RESOURCE_INCLUDED so that tcl.h can be passed to the resource compiler. * generic/tcl.h: * generic/tclNotify.c: added a few Notifier procs, to be able to modify more bits of the Tcl notifier dynamically. Required to get Mac OS X Tk to live on top of the Tcl Unix threaded notifier. Changes the size of the Tcl_NotifierProcs structure, but doesn't move any elements around. * unix/tclUnixNotfy.c: moved the call to Tcl_ConditionNotify till AFTER we are done mucking with the pointer swap. Fixes cases where the thread waiting on the condition wakes & accesses the waitingListPtr before it gets reset, causing a hang. * library/auto.tcl (tcl_findLibrary): added checking the directories in the tcl_pkgPath for library files on macosx to enable support of the standard Mac OSX library locations * unix/Makefile.in: * unix/configure.in: * unix/tcl.m4: added MAC_OSX_DIR. Added PLAT_OBJS to the OBJS: there are some MacOS X specific files now for Tcl, and when I get he resource & applescript stuff ported over, and restore support for FindFiles, etc, there will be a few more. Added LD_LIBRARY_PATH_VAR configure variable to avoid having to set all possible LD_LIBRARY_PATH analogues on all platforms. LD_LIBRARY_PATH_VAR is "LD_LIBRARY_PATH" by default, "LIBPATH" on AIX, "SHLIB_PATH" on HPUX and "DYLD_LIBRARY_PATH" on Mac OSX. Added configure option to package Tcl as a framework on Mac OSX. * macosx/tclMacOSXBundle.c (new): support for finding Tcl extension packaged as 'bundles' in the standard Mac OSX library locations. * unix/tclUnixInit.c: added support for findig the tcl script library inside Tcl packaged as a framework on Mac OSX. * macosx/Tcl.pbproj/jingham.pbxuser (new): * macosx/Tcl.pbproj/project.pbxproj (new): project for Apple's ProjectBuilder IDE. * macosx/Makefile (new): simple makefile for building the project from the command line via the ProjectBuilder tool 'pbxbuild'. * unix/configure: * generic/tclStubInit.c: * generic/tclPlatDecls.h: regen --- ChangeLog | 61 ++ generic/tcl.decls | 14 +- generic/tcl.h | 22 +- generic/tclNotify.c | 14 +- generic/tclPlatDecls.h | 18 +- generic/tclStubInit.c | 5 +- library/auto.tcl | 10 +- macosx/Makefile | 56 ++ macosx/Tcl.pbproj/jingham.pbxuser | 405 ++++++++++++ macosx/Tcl.pbproj/project.pbxproj | 1308 +++++++++++++++++++++++++++++++++++++ macosx/tclMacOSXBundle.c | 128 ++++ tools/genStubs.tcl | 80 ++- unix/Makefile.in | 55 +- unix/configure | 780 ++++++++++++---------- unix/configure.in | 17 +- unix/tcl.m4 | 72 +- unix/tclUnixInit.c | 73 ++- unix/tclUnixNotfy.c | 4 +- 18 files changed, 2703 insertions(+), 419 deletions(-) create mode 100644 macosx/Makefile create mode 100644 macosx/Tcl.pbproj/jingham.pbxuser create mode 100644 macosx/Tcl.pbproj/project.pbxproj create mode 100644 macosx/tclMacOSXBundle.c diff --git a/ChangeLog b/ChangeLog index ecae9fb..18f5bc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +2002-08-31 Daniel Steffen + + *** macosx-8-4-branch merged into the mainline [patch 602770] *** + + * generic/tcl.decls: added new macosx specific entry to stubs table. + + * tools/genStubs.tcl: added generation of platform guards for + macosx. This is a little more complex than it seems, because MacOS + X IS "unix" plus a little bit, for the purposes of Tcl. BUT + unfortunately, Tk uses "unix" to mean X11. So added platform keys + for macosx (the little added to "unix"), "aqua" and "x11" to + distinguish these for Tk. + + * generic/tcl.h: added a #ifnded RESOURCE_INCLUDED so that tcl.h + can be passed to the resource compiler. + + * generic/tcl.h: + * generic/tclNotify.c: added a few Notifier procs, to be able to + modify more bits of the Tcl notifier dynamically. Required to get + Mac OS X Tk to live on top of the Tcl Unix threaded notifier. + Changes the size of the Tcl_NotifierProcs structure, but doesn't + move any elements around. + + * unix/tclUnixNotfy.c: moved the call to Tcl_ConditionNotify till + AFTER we are done mucking with the pointer swap. Fixes cases where + the thread waiting on the condition wakes & accesses the + waitingListPtr before it gets reset, causing a hang. + + * library/auto.tcl (tcl_findLibrary): added checking the + directories in the tcl_pkgPath for library files on macosx to + enable support of the standard Mac OSX library locations + + * unix/Makefile.in: + * unix/configure.in: + * unix/tcl.m4: added MAC_OSX_DIR. Added PLAT_OBJS to the OBJS: + there are some MacOS X specific files now for Tcl, and when I get + he resource & applescript stuff ported over, and restore support + for FindFiles, etc, there will be a few more. + Added LD_LIBRARY_PATH_VAR configure variable to avoid having to set + all possible LD_LIBRARY_PATH analogues on all platforms. + LD_LIBRARY_PATH_VAR is "LD_LIBRARY_PATH" by default, "LIBPATH" on + AIX, "SHLIB_PATH" on HPUX and "DYLD_LIBRARY_PATH" on Mac OSX. + Added configure option to package Tcl as a framework on Mac OSX. + + * macosx/tclMacOSXBundle.c (new): support for finding Tcl extension + packaged as 'bundles' in the standard Mac OSX library locations. + + * unix/tclUnixInit.c: added support for findig the tcl script + library inside Tcl packaged as a framework on Mac OSX. + + * macosx/Tcl.pbproj/jingham.pbxuser (new): + * macosx/Tcl.pbproj/project.pbxproj (new): project for Apple's + ProjectBuilder IDE. + + * macosx/Makefile (new): simple makefile for building the project + from the command line via the ProjectBuilder tool 'pbxbuild'. + + * unix/configure: + * generic/tclStubInit.c: + * generic/tclPlatDecls.h: regen + 2002-08-29 Andreas Kupries * win/tclWinThrd.c (TclpFinalizeThreadData, TclWinFreeAllocCache): diff --git a/generic/tcl.decls b/generic/tcl.decls index 7cfb65b..2dbc2c5 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tcl.decls,v 1.93 2002/08/05 15:01:03 dgp Exp $ +# RCS: @(#) $Id: tcl.decls,v 1.94 2002/08/31 06:09:45 das Exp $ library tcl @@ -1821,3 +1821,15 @@ declare 7 mac { declare 8 mac { int strcasecmp(CONST char *s1, CONST char *s2) } + +################## +# Mac OS X declarations +# + +declare 0 macosx { + int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp, + CONST char *bundleName, + int hasResourceFile, + int maxPathLen, + char *libraryPath) +} diff --git a/generic/tcl.h b/generic/tcl.h index 8de3c7e..bb62de4 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.140 2002/08/20 15:33:32 dgp Exp $ + * RCS: @(#) $Id: tcl.h,v 1.141 2002/08/31 06:09:45 das Exp $ */ #ifndef _TCL @@ -125,6 +125,16 @@ extern "C" { #ifndef RC_INVOKED +/* + * A special definition for Macintosh used to allow this header file + * to be included in resource files so that they can get obtain + * version information from this file. Resource compilers don't like + * all the C stuff, like typedefs and procedure declarations, that + * occur below. +*/ + +#ifndef RESOURCE_INCLUDED + /* * Special macro to define mutexes, that doesn't do anything * if we are not using threads. @@ -697,6 +707,10 @@ typedef void (Tcl_CommandTraceProc) _ANSI_ARGS_((ClientData clientData, typedef void (Tcl_CreateFileHandlerProc) _ANSI_ARGS_((int fd, int mask, Tcl_FileProc *proc, ClientData clientData)); typedef void (Tcl_DeleteFileHandlerProc) _ANSI_ARGS_((int fd)); +typedef void (Tcl_AlertNotifierProc) _ANSI_ARGS_((ClientData clientData)); +typedef void (Tcl_ServiceModeHookProc) _ANSI_ARGS_((int mode)); +typedef ClientData (Tcl_InitNotifierProc) _ANSI_ARGS_((VOID)); +typedef void (Tcl_FinalizeNotifierProc) _ANSI_ARGS_((ClientData clientData)); typedef void (Tcl_MainLoopProc) _ANSI_ARGS_((void)); @@ -1866,6 +1880,10 @@ typedef struct Tcl_NotifierProcs { Tcl_WaitForEventProc *waitForEventProc; Tcl_CreateFileHandlerProc *createFileHandlerProc; Tcl_DeleteFileHandlerProc *deleteFileHandlerProc; + Tcl_InitNotifierProc *initNotifierProc; + Tcl_FinalizeNotifierProc *finalizeNotifierProc; + Tcl_AlertNotifierProc *alertNotifierProc; + Tcl_ServiceModeHookProc *serviceModeHookProc; } Tcl_NotifierProcs; @@ -2269,6 +2287,8 @@ EXTERN int Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp)); #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +#endif /* RESOURCE_INCLUDED */ + /* * end block for C++ */ diff --git a/generic/tclNotify.c b/generic/tclNotify.c index 2f32adc..a8754b0 100644 --- a/generic/tclNotify.c +++ b/generic/tclNotify.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclNotify.c,v 1.8 2002/04/12 06:31:28 hobbs Exp $ + * RCS: @(#) $Id: tclNotify.c,v 1.9 2002/08/31 06:09:45 das Exp $ */ #include "tclInt.h" @@ -116,7 +116,7 @@ TclInitNotifier() Tcl_MutexLock(&listLock); tsdPtr->threadId = Tcl_GetCurrentThread(); - tsdPtr->clientData = Tcl_InitNotifier(); + tsdPtr->clientData = tclStubs.tcl_InitNotifier(); tsdPtr->nextPtr = firstNotifierPtr; firstNotifierPtr = tsdPtr; @@ -160,7 +160,7 @@ TclFinalizeNotifier() Tcl_MutexLock(&listLock); - Tcl_FinalizeNotifier(tsdPtr->clientData); + tclStubs.tcl_FinalizeNotifier(tsdPtr->clientData); Tcl_MutexFinalize(&(tsdPtr->queueMutex)); for (prevPtrPtr = &firstNotifierPtr; *prevPtrPtr != NULL; prevPtrPtr = &((*prevPtrPtr)->nextPtr)) { @@ -203,6 +203,10 @@ Tcl_SetNotifier(notifierProcPtr) #endif tclStubs.tcl_SetTimer = notifierProcPtr->setTimerProc; tclStubs.tcl_WaitForEvent = notifierProcPtr->waitForEventProc; + tclStubs.tcl_InitNotifier = notifierProcPtr->initNotifierProc; + tclStubs.tcl_FinalizeNotifier = notifierProcPtr->finalizeNotifierProc; + tclStubs.tcl_AlertNotifier = notifierProcPtr->alertNotifierProc; + tclStubs.tcl_ServiceModeHook = notifierProcPtr->serviceModeHookProc; } /* @@ -717,7 +721,7 @@ Tcl_SetServiceMode(mode) oldMode = tsdPtr->serviceMode; tsdPtr->serviceMode = mode; - Tcl_ServiceModeHook(mode); + tclStubs.tcl_ServiceModeHook(mode); return oldMode; } @@ -1083,7 +1087,7 @@ Tcl_ThreadAlert(threadId) Tcl_MutexLock(&listLock); for (tsdPtr = firstNotifierPtr; tsdPtr; tsdPtr = tsdPtr->nextPtr) { if (tsdPtr->threadId == threadId) { - Tcl_AlertNotifier(tsdPtr->clientData); + tclStubs.tcl_AlertNotifier(tsdPtr->clientData); break; } } diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index c499d29..e0fed76 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -6,7 +6,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclPlatDecls.h,v 1.16 2002/02/08 02:52:54 dgp Exp $ + * RCS: @(#) $Id: tclPlatDecls.h,v 1.17 2002/08/31 06:09:45 das Exp $ */ #ifndef _TCLPLATDECLS @@ -74,6 +74,13 @@ EXTERN int strncasecmp _ANSI_ARGS_((CONST char * s1, EXTERN int strcasecmp _ANSI_ARGS_((CONST char * s1, CONST char * s2)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TCL +/* 0 */ +EXTERN int Tcl_MacOSXOpenBundleResources _ANSI_ARGS_(( + Tcl_Interp * interp, CONST char * bundleName, + int hasResourceFile, int maxPathLen, + char * libraryPath)); +#endif /* MAC_OSX_TCL */ typedef struct TclPlatStubs { int magic; @@ -94,6 +101,9 @@ typedef struct TclPlatStubs { int (*strncasecmp) _ANSI_ARGS_((CONST char * s1, CONST char * s2, size_t n)); /* 7 */ int (*strcasecmp) _ANSI_ARGS_((CONST char * s1, CONST char * s2)); /* 8 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TCL + int (*tcl_MacOSXOpenBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * bundleName, int hasResourceFile, int maxPathLen, char * libraryPath)); /* 0 */ +#endif /* MAC_OSX_TCL */ } TclPlatStubs; #ifdef __cplusplus @@ -158,6 +168,12 @@ extern TclPlatStubs *tclPlatStubsPtr; (tclPlatStubsPtr->strcasecmp) /* 8 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TCL +#ifndef Tcl_MacOSXOpenBundleResources +#define Tcl_MacOSXOpenBundleResources \ + (tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */ +#endif +#endif /* MAC_OSX_TCL */ #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index a9f5ab4..49f581c 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclStubInit.c,v 1.74 2002/08/06 01:49:27 das Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.75 2002/08/31 06:09:45 das Exp $ */ #include "tclInt.h" @@ -351,6 +351,9 @@ TclPlatStubs tclPlatStubs = { strncasecmp, /* 7 */ strcasecmp, /* 8 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TCL + Tcl_MacOSXOpenBundleResources, /* 0 */ +#endif /* MAC_OSX_TCL */ }; static TclStubHooks tclStubHooks = { diff --git a/library/auto.tcl b/library/auto.tcl index 296764f..b023f59 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -3,7 +3,7 @@ # utility procs formerly in init.tcl dealing with auto execution # of commands and can be auto loaded themselves. # -# RCS: @(#) $Id: auto.tcl,v 1.9 2002/07/03 19:40:31 dgp Exp $ +# RCS: @(#) $Id: auto.tcl,v 1.10 2002/08/31 06:09:45 das Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1998 Sun Microsystems, Inc. @@ -97,6 +97,14 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { lappend dirs [file join $grandParentDir $basename$patch library] lappend dirs [file join [file dirname $grandParentDir] \ $basename$patch library] + + # 4. On MacOSX, check the directories in the tcl_pkgPath + if {[string equal $::tcl_platform(platform) "unix"] && \ + [string equal $::tcl_platform(os) "Darwin"]} { + foreach d $::tcl_pkgPath { + lappend dirs [file join $d $basename$version] + } + } } foreach i $dirs { set the_library $i diff --git a/macosx/Makefile b/macosx/Makefile new file mode 100644 index 0000000..050f482 --- /dev/null +++ b/macosx/Makefile @@ -0,0 +1,56 @@ +################################################################################ +# +# Simple makefile for building on Mac OS X with the +# Project Builder command line tool 'pbxbuild' +# +# RCS: @(#) $Id: Makefile,v 1.2 2002/08/31 06:09:45 das Exp $ +# +################################################################################ + +INSTALL_ROOT = + +BUILD_DIR = ../../build + +TARGET = Tcl + +DEVBUILDSTYLE = Development +DEPBUILDSTYLE = Deployment + +PBXBUILD = /usr/bin/pbxbuild + +BUILD = ${PBXBUILD} SYMROOT="${BUILD_DIR}" -target "${TARGET}" + +DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" +DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" + +INSTALLOPTS = INSTALL_ROOT="${INSTALL_ROOT}" + +################################################################################ + +all: develop deploy + +install: install-develop install-deploy + +clean: clean-develop clean-deploy + +################################################################################ + +develop: + ${DEVBUILD} + +deploy: + ${DEPBUILD} + +install-develop: + ${DEVBUILD} install ${INSTALLOPTS} + +install-deploy: + ${DEPBUILD} install ${INSTALLOPTS} + +clean-develop: + ${DEVBUILD} clean + +clean-deploy: + ${DEPBUILD} clean + +################################################################################ diff --git a/macosx/Tcl.pbproj/jingham.pbxuser b/macosx/Tcl.pbproj/jingham.pbxuser new file mode 100644 index 0000000..d914578 --- /dev/null +++ b/macosx/Tcl.pbproj/jingham.pbxuser @@ -0,0 +1,405 @@ +// !$*UTF8*$! +{ + 005751AA02FB00930AC916F0 = { + fRef = 005751AB02FB00930AC916F0; + isa = PBXTextBookmark; + name = "DefaultsDoc.rtf: 30"; + rLen = 32; + rLoc = 2777; + rType = 0; + vrLen = 1334; + vrLoc = 2136; + }; + 005751AB02FB00930AC916F0 = { + isa = PBXFileReference; + name = DefaultsDoc.rtf; + path = "/Developer/Applications/Project Builder.app/Contents/Resources/DefaultsDoc.rtf"; + refType = 0; + }; + 00E2F845016E82EB0ACA28DC = { + activeBuildStyle = 00E2F847016E82EB0ACA28DC; + activeTarget = F50DC359017027D801DC9062; + addToTargets = ( + 00E2F84C016E8B780ACA28DC, + ); + breakpoints = ( + ); + perUserDictionary = { + PBXPerProjectTemplateStateSaveDate = 49920633; + "PBXTemplateGeometry-F5314676015831810DCA290F" = { + ContentSize = "{789, 551}"; + LeftSlideOut = { + Collapsed = NO; + Frame = "{{0, 23}, {789, 528}}"; + Split0 = { + ActiveTab = 2; + Collapsed = NO; + Frame = "{{0, 0}, {789, 528}}"; + Split0 = { + Frame = "{{0, 204}, {789, 324}}"; + }; + SplitCount = 1; + Tab0 = { + Debugger = { + Collapsed = NO; + Frame = "{{0, 0}, {952, 321}}"; + Split0 = { + Frame = "{{0, 24}, {952, 297}}"; + Split0 = { + Frame = "{{0, 0}, {468, 297}}"; + }; + Split1 = { + DebugVariablesTableConfiguration = ( + Name, + 123, + Value, + 85, + Summary, + 241.123, + ); + Frame = "{{477, 0}, {475, 297}}"; + }; + SplitCount = 2; + }; + SplitCount = 1; + Tab0 = { + Frame = "{{0, 0}, {100, 50}}"; + }; + Tab1 = { + Frame = "{{0, 0}, {100, 50}}"; + }; + TabCount = 2; + TabsVisible = YES; + }; + Frame = "{{0, 0}, {952, 321}}"; + LauncherConfigVersion = 7; + }; + Tab1 = { + Frame = "{{0, 0}, {781, 452}}"; + LauncherConfigVersion = 3; + Runner = { + Frame = "{{0, 0}, {781, 452}}"; + }; + }; + Tab2 = { + BuildMessageFrame = "{{0, 0}, {791, 191}}"; + BuildTranscriptFrame = "{{0, 200}, {791, 0}}"; + Frame = "{{0, 0}, {789, 198}}"; + }; + Tab3 = { + Frame = "{{0, 0}, {612, 295}}"; + }; + TabCount = 4; + TabsVisible = NO; + }; + SplitCount = 1; + Tab0 = { + Frame = "{{0, 0}, {300, 533}}"; + GroupTreeTableConfiguration = ( + TargetStatusColumn, + 18, + MainColumn, + 267, + ); + }; + Tab1 = { + ClassesFrame = "{{0, 0}, {280, 398}}"; + ClassesTreeTableConfiguration = ( + PBXBookColumnIdentifier, + 20, + PBXClassColumnIdentifier, + 237, + ); + Frame = "{{0, 0}, {278, 659}}"; + MembersFrame = "{{0, 407}, {280, 252}}"; + MembersTreeTableConfiguration = ( + PBXBookColumnIdentifier, + 20, + PBXMethodColumnIdentifier, + 236, + ); + }; + Tab2 = { + Frame = "{{0, 0}, {200, 100}}"; + }; + Tab3 = { + Frame = "{{0, 0}, {200, 100}}"; + TargetTableConfiguration = ( + ActiveObject, + 16, + ObjectNames, + 202.296, + ); + }; + Tab4 = { + BreakpointsTreeTableConfiguration = ( + breakpointColumn, + 197, + enabledColumn, + 31, + ); + Frame = "{{0, 0}, {250, 100}}"; + }; + TabCount = 5; + TabsVisible = NO; + }; + StatusViewVisible = YES; + Template = F5314676015831810DCA290F; + ToolbarVisible = YES; + WindowLocation = "{7, 385}"; + }; + PBXWorkspaceContents = ( + { + LeftSlideOut = { + Split0 = { + Split0 = { + NavContent0 = { + bookmark = 005751AA02FB00930AC916F0; + history = ( + F5BFE56402F8B7A901DC9062, + F5BFE56702F8B7A901DC9062, + 00F4D9CE02F9BA490AC916F0, + ); + prevStack = ( + F5BFE56A02F8B7A901DC9062, + ); + }; + NavCount = 1; + NavGeometry0 = { + Frame = "{{0, 0}, {571, 548}}"; + NavBarVisible = YES; + }; + }; + SplitCount = 1; + Tab0 = { + Debugger = { + Split0 = { + SplitCount = 2; + }; + SplitCount = 1; + TabCount = 2; + }; + LauncherConfigVersion = 7; + }; + Tab1 = { + LauncherConfigVersion = 3; + Runner = { + }; + }; + TabCount = 4; + }; + SplitCount = 1; + Tab1 = { + OptionsSetName = "Default Options"; + }; + TabCount = 5; + }; + }, + ); + PBXWorkspaceGeometries = ( + { + ContentSize = "{855, 571}"; + LeftSlideOut = { + ActiveTab = 0; + Collapsed = NO; + Frame = "{{0, 23}, {855, 548}}"; + Split0 = { + Collapsed = NO; + Frame = "{{284, 0}, {571, 548}}"; + Split0 = { + Frame = "{{0, 0}, {571, 548}}"; + }; + SplitCount = 1; + Tab0 = { + Debugger = { + Collapsed = NO; + Frame = "{{0, 0}, {681, 289}}"; + Split0 = { + Frame = "{{0, 24}, {681, 265}}"; + Split0 = { + Frame = "{{0, 0}, {333, 265}}"; + }; + Split1 = { + DebugVariablesTableConfiguration = ( + Name, + 82.80298, + Value, + 104.074, + Summary, + 126.123, + ); + Frame = "{{342, 0}, {339, 265}}"; + }; + SplitCount = 2; + }; + SplitCount = 1; + Tab0 = { + Frame = "{{0, 0}, {100, 50}}"; + }; + Tab1 = { + Frame = "{{0, 0}, {100, 50}}"; + }; + TabCount = 2; + TabsVisible = YES; + }; + Frame = "{{0, 0}, {681, 289}}"; + LauncherConfigVersion = 7; + }; + Tab1 = { + Frame = "{{0, 0}, {681, 120}}"; + LauncherConfigVersion = 3; + Runner = { + Frame = "{{0, 0}, {681, 120}}"; + }; + }; + Tab2 = { + BuildMessageFrame = "{{0, 0}, {683, 127}}"; + BuildTranscriptFrame = "{{0, 136}, {683, 100}}"; + Frame = "{{0, 0}, {681, 234}}"; + }; + Tab3 = { + Frame = "{{0, 0}, {681, 238}}"; + }; + TabCount = 4; + TabsVisible = NO; + }; + SplitCount = 1; + Tab0 = { + Frame = "{{0, 0}, {260, 548}}"; + GroupTreeTableConfiguration = ( + SCMStatusColumn, + 22, + TargetStatusColumn, + 18, + MainColumn, + 205, + ); + }; + Tab1 = { + ClassesFrame = "{{0, 0}, {250, 333}}"; + ClassesTreeTableConfiguration = ( + PBXBookColumnIdentifier, + 20, + PBXClassColumnIdentifier, + 207, + ); + Frame = "{{0, 0}, {248, 554}}"; + MembersFrame = "{{0, 342}, {250, 212}}"; + MembersTreeTableConfiguration = ( + PBXBookColumnIdentifier, + 20, + PBXMethodColumnIdentifier, + 206, + ); + }; + Tab2 = { + Frame = "{{0, 0}, {217, 554}}"; + }; + Tab3 = { + Frame = "{{0, 0}, {239, 548}}"; + TargetTableConfiguration = ( + ActiveObject, + 16, + ObjectNames, + 206, + ); + }; + Tab4 = { + BreakpointsTreeTableConfiguration = ( + breakpointColumn, + 197, + enabledColumn, + 31, + ); + Frame = "{{0, 0}, {250, 554}}"; + }; + TabCount = 5; + TabsVisible = YES; + }; + StatusViewVisible = YES; + Template = 64ABBB4501FA494900185B06; + ToolbarVisible = YES; + WindowLocation = "{77, 330}"; + }, + ); + PBXWorkspaceStateSaveDate = 49920633; + }; + perUserProjectItems = { + 005751AA02FB00930AC916F0 = 005751AA02FB00930AC916F0; + 00F4D9CE02F9BA490AC916F0 = 00F4D9CE02F9BA490AC916F0; + F5BFE56402F8B7A901DC9062 = F5BFE56402F8B7A901DC9062; + F5BFE56702F8B7A901DC9062 = F5BFE56702F8B7A901DC9062; + F5BFE56A02F8B7A901DC9062 = F5BFE56A02F8B7A901DC9062; + }; + projectwideBuildSettings = { + OBJROOT = "/Volumes/TheCloset/jingham/tcl-tk/source/tcl-merge/Objects"; + SYMROOT = "/Volumes/TheCloset/jingham/tcl-tk/source/tcl-merge/Products"; + }; + wantsIndex = 1; + wantsSCM = 1; + }; + 00E2F84B016E8A830ACA28DC = { + activeExec = 0; + }; + 00E2F84C016E8B780ACA28DC = { + activeExec = 0; + }; + 00E2F84E016E92110ACA28DC = { + activeExec = 0; + }; + 00F4D9CE02F9BA490AC916F0 = { + fRef = 00F4D9CF02F9BA4A0AC916F0; + isa = PBXTextBookmark; + name = "DefaultsDoc.rtf: 30"; + rLen = 32; + rLoc = 2777; + rType = 0; + vrLen = 1334; + vrLoc = 2136; + }; + 00F4D9CF02F9BA4A0AC916F0 = { + isa = PBXFileReference; + name = DefaultsDoc.rtf; + path = "/Developer/Applications/Project Builder.app/Contents/Resources/DefaultsDoc.rtf"; + refType = 0; + }; + F50DC359017027D801DC9062 = { + activeExec = 0; + }; + F5BFE56402F8B7A901DC9062 = { + fRef = F5BFE56E02F8B7AA01DC9062; + isa = PBXTextBookmark; + name = "stat.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1666; + vrLoc = 3618; + }; + F5BFE56702F8B7A901DC9062 = { + fRef = F5F24F6E016ECAA401DC9062; + isa = PBXTextBookmark; + name = "tcl.h: 397"; + rLen = 6; + rLoc = 11199; + rType = 0; + vrLen = 1293; + vrLoc = 10644; + }; + F5BFE56A02F8B7A901DC9062 = { + fRef = F5F24F6E016ECAA401DC9062; + isa = PBXTextBookmark; + name = "tcl.h: 397"; + rLen = 6; + rLoc = 11199; + rType = 0; + vrLen = 1293; + vrLoc = 10644; + }; + F5BFE56E02F8B7AA01DC9062 = { + isa = PBXFileReference; + name = stat.h; + path = /usr/include/sys/stat.h; + refType = 0; + }; +} diff --git a/macosx/Tcl.pbproj/project.pbxproj b/macosx/Tcl.pbproj/project.pbxproj new file mode 100644 index 0000000..931bf73 --- /dev/null +++ b/macosx/Tcl.pbproj/project.pbxproj @@ -0,0 +1,1308 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 38; + objects = { + 00530A0D0173C8270ACA28DC = { + buildActionMask = 12; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# install to ${INSTALL_ROOT} with optional stripping\ncd ${TEMP_DIR}/..\nif test \"${INSTALL_STRIP}\" = \"YES\"; then\nexport INSTALL_PROGRAM='${INSTALL} ${INSTALL_STRIP_PROGRAM}'\nexport INSTALL_LIBRARY='${INSTALL} ${INSTALL_STRIP_LIBRARY}'\nelse\nexport INSTALL_PROGRAM='${INSTALL}'\nexport INSTALL_LIBRARY='${INSTALL}'\nfi\ngnumake install-binaries install-libraries TCL_LIBRARY=\"@TCL_IN_FRAMEWORK@\" INSTALL_ROOT=\"${INSTALL_ROOT}\" SCRIPT_INSTALL_DIR=\"${INSTALL_ROOT}${LIBDIR}/Resources/Scripts\" INSTALL_PROGRAM=\"${INSTALL_PROGRAM}\" INSTALL_LIBRARY=\"${INSTALL_LIBRARY}\""; + }; + 00530A0E0173CC960ACA28DC = { + buildActionMask = 12; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# fixup Framework structure\ncd \"${INSTALL_ROOT}${LIBDIR}\"\nln -fs Versions/Current/Headers ../..\nmv -f tclConfig.sh Resources\nif [ \"${BUILD_STYLE}\" = \"Development\" ]; then\n\t# keep copy of debug library around, so that\n\t# Deployment build can be installed on top\n\t# of Development build without overwriting\n\t# the debuglibrary\n\tcp -fp \"${PRODUCT_NAME}\" \"${PRODUCT_NAME}_debug\"\nfi"; + }; + 00E2F845016E82EB0ACA28DC = { + buildStyles = ( + 00E2F847016E82EB0ACA28DC, + 00E2F848016E82EB0ACA28DC, + ); + isa = PBXProject; + mainGroup = 00E2F846016E82EB0ACA28DC; + productRefGroup = 00E2F84A016E8A830ACA28DC; + projectDirPath = ""; + targets = ( + 00E2F84E016E92110ACA28DC, + 00E2F84B016E8A830ACA28DC, + 00E2F84C016E8B780ACA28DC, + ); + }; + 00E2F846016E82EB0ACA28DC = { + children = ( + F5C88655017D604601DC9062, + F5F24FEE016ED0DF01DC9062, + 00E2F855016E922C0ACA28DC, + 00E2F857016E92B00ACA28DC, + 00E2F85A016E92B00ACA28DC, + 00E2F84A016E8A830ACA28DC, + ); + isa = PBXGroup; + refType = 4; + }; + 00E2F847016E82EB0ACA28DC = { + buildRules = ( + ); + buildSettings = { + EXTRA_CONFIGURE_FLAGS = "--enable-symbols"; + INSTALL_STRIP = NO; + TEMP_DIR = "${OBJROOT}/Development.build/$(PROJECT_NAME).build/$(TARGET_NAME).build"; + }; + isa = PBXBuildStyle; + name = Development; + }; + 00E2F848016E82EB0ACA28DC = { + buildRules = ( + ); + buildSettings = { + INSTALL_STRIP = YES; + TEMP_DIR = "${OBJROOT}/Deployment.build/$(PROJECT_NAME).build/$(TARGET_NAME).build"; + }; + isa = PBXBuildStyle; + name = Deployment; + }; + 00E2F84A016E8A830ACA28DC = { + children = ( + 00E2F84D016E92110ACA28DC, + F53ACC5C031D9D11016F146B, + F53ACC73031DA405016F146B, + ); + isa = PBXGroup; + name = Products; + refType = 4; + }; + 00E2F84B016E8A830ACA28DC = { + buildArgumentsString = "-c \"if [ \\\"${ACTION}\\\" != \\\"clean\\\" ]; then if [ -z \\\"`find . -name Makefile -newer \\\"${SRCROOT}/../unix/configure\\\"`\\\" ]; then \\\"${SRCROOT}/../unix/configure\\\" --prefix=/usr --mandir=/usr/share/man --libdir=\\\"${LIBDIR}\\\" --includedir=\\\"${LIBDIR}/Headers\\\" --enable-threads --enable-framework ${EXTRA_CONFIGURE_FLAGS}; mkdir -p Tcl.framework; ln -fs ../Tcl Tcl.framework/Tcl; fi; else rm -f Makefile; fi\""; + buildPhases = ( + ); + buildSettings = { + EXTRA_CONFIGURE_FLAGS = ""; + FRAMEWORK_VERSION = 8.4; + INSTALL_PATH = /Library/Frameworks; + LIBDIR = "${INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}"; + PRODUCT_NAME = Tcl; + }; + buildToolPath = /bin/sh; + buildWorkingDirectory = "${TEMP_DIR}/.."; + dependencies = ( + ); + isa = PBXLegacyTarget; + name = Configure; + productName = Configure; + settingsToExpand = 6; + settingsToPassInEnvironment = 287; + settingsToPassOnCommandLine = 280; + shouldUseHeadermap = 0; + }; + 00E2F84C016E8B780ACA28DC = { + buildArgumentsString = "-c \"if [ \\\"${ACTION}\\\" != \\\"clean\\\" ]; then make tclsh tcltest TCL_LIBRARY=\\\"@TCL_IN_FRAMEWORK@\\\" ${EXTRA_MAKE_FLAGS} TCL_PACKAGE_PATH=\\\"~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl\\\"; else make clean; fi\""; + buildPhases = ( + ); + buildSettings = { + EXTRA_MAKE_FLAGS = ""; + PRODUCT_NAME = Tcl; + }; + buildToolPath = /bin/sh; + buildWorkingDirectory = "${TEMP_DIR}/.."; + dependencies = ( + F5877EB5031F7997016F146B, + ); + isa = PBXLegacyTarget; + name = Make; + productName = Make; + settingsToExpand = 6; + settingsToPassInEnvironment = 287; + settingsToPassOnCommandLine = 280; + shouldUseHeadermap = 0; + }; + 00E2F84D016E92110ACA28DC = { + isa = PBXFrameworkReference; + path = Tcl.framework; + refType = 3; + }; + 00E2F84E016E92110ACA28DC = { + buildPhases = ( + F5877FB6031F97AF016F146B, + F50DC36A01703B7301DC9062, + F50DC367017033D701DC9062, + F50DC3680170344801DC9062, + 00E2F84F016E92110ACA28DC, + F5BE9BBF02FB5974016F146B, + 00530A0D0173C8270ACA28DC, + 00530A0E0173CC960ACA28DC, + F5877FBB031FA90A016F146B, + F59AE5E3017AC67A01DC9062, + ); + buildSettings = { + DSTROOT = "${TEMP_DIR}"; + EXTRA_MAKE_INSTALL_FLAGS = ""; + FRAMEWORK_VERSION = 8.4; + INSTALL_PATH = /Library/Frameworks; + LIBDIR = "${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Versions/${FRAMEWORK_VERSION}"; + PRODUCT_NAME = Tcl; + WRAPPER_EXTENSION = framework; + }; + dependencies = ( + F5877EB6031F79A4016F146B, + ); + isa = PBXFrameworkTarget; + name = Tcl; + productInstallPath = /Library/Frameworks; + productName = TclLibrary; + productReference = 00E2F84D016E92110ACA28DC; + productSettingsXML = " + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Tcl + CFBundleGetInfoString + Tcl Library + CFBundleIconFile + + CFBundleIdentifier + com.tcltk.tcllibrary + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Tcl Library 8.4b3 + CFBundlePackageType + FMWK + CFBundleShortVersionString + libtcl8.4b3 + CFBundleSignature + Tcl + CFBundleVersion + 8.4b3 + + +"; + shouldUseHeadermap = 0; + }; + 00E2F84F016E92110ACA28DC = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 00E2F854016E922C0ACA28DC = { + children = ( + F5F24F87016ECAFC01DC9062, + F5F24F88016ECAFC01DC9062, + F5F24F89016ECAFC01DC9062, + F5F24F8A016ECAFC01DC9062, + F5F24F8B016ECAFC01DC9062, + F5F24F8C016ECAFC01DC9062, + F5F24F8D016ECAFC01DC9062, + F5F24F8E016ECAFC01DC9062, + F5F24F8F016ECAFC01DC9062, + F5F24F90016ECAFC01DC9062, + F5F24F91016ECAFC01DC9062, + F5F24F92016ECAFC01DC9062, + F5F24F93016ECAFC01DC9062, + F5F24F94016ECAFC01DC9062, + F5F24F95016ECAFC01DC9062, + F5F24F96016ECAFC01DC9062, + F5F24F97016ECAFC01DC9062, + F5F24F98016ECAFC01DC9062, + F5F24F99016ECAFC01DC9062, + F5F24F9A016ECAFC01DC9062, + F5F24F9B016ECAFC01DC9062, + F5F24F9C016ECAFC01DC9062, + F5F24F9D016ECAFC01DC9062, + F5F24F9E016ECAFC01DC9062, + F5F24F9F016ECAFC01DC9062, + F5F24FA0016ECAFC01DC9062, + F5F24FA1016ECAFC01DC9062, + F5F24FA2016ECAFC01DC9062, + F5F24FA3016ECAFC01DC9062, + F5F24FA4016ECAFC01DC9062, + F5F24FA5016ECAFC01DC9062, + F5F24FA6016ECAFC01DC9062, + F5F24FA7016ECAFC01DC9062, + F5F24FA8016ECAFC01DC9062, + F5F24FA9016ECAFC01DC9062, + F5F24FAA016ECAFC01DC9062, + F5F24FAB016ECAFC01DC9062, + F5F24FAC016ECAFC01DC9062, + F5F24FAD016ECAFC01DC9062, + F5F24FAE016ECAFC01DC9062, + F5F24FAF016ECAFC01DC9062, + F5F24FB0016ECAFC01DC9062, + F5F24FB1016ECAFC01DC9062, + F5F24FB2016ECAFC01DC9062, + F5F24FB3016ECAFC01DC9062, + F5F24FB4016ECAFC01DC9062, + F5F24FB5016ECAFC01DC9062, + F5F24FB6016ECAFC01DC9062, + F5F24FB7016ECAFC01DC9062, + F5F24FB8016ECAFC01DC9062, + F5F24FB9016ECAFC01DC9062, + F5F24FBA016ECAFC01DC9062, + F5F24FBB016ECAFC01DC9062, + F5F24FD3016ECB4901DC9062, + F5F24FBC016ECAFC01DC9062, + F5F24FBD016ECAFC01DC9062, + F5F24FBE016ECAFC01DC9062, + F5F24FBF016ECAFC01DC9062, + F5F24FC0016ECAFC01DC9062, + F5F24FC1016ECAFC01DC9062, + F5F24FC2016ECAFC01DC9062, + F5F24FC3016ECAFC01DC9062, + F5F24FC4016ECAFC01DC9062, + F5F24FC5016ECAFC01DC9062, + F5F24FC6016ECAFC01DC9062, + F5F24FC7016ECAFC01DC9062, + F5F24FC8016ECAFC01DC9062, + F5F24FC9016ECAFC01DC9062, + F5F24FCA016ECAFC01DC9062, + F5F24FCB016ECAFC01DC9062, + F5F24FCC016ECAFC01DC9062, + F5F24FCD016ECAFC01DC9062, + F5F24FCE016ECAFC01DC9062, + F5F24FCF016ECAFC01DC9062, + F5F24FD0016ECAFC01DC9062, + ); + isa = PBXGroup; + name = Sources; + path = ""; + refType = 4; + }; + 00E2F855016E922C0ACA28DC = { + children = ( + 00E2F856016E92B00ACA28DC, + 00E2F854016E922C0ACA28DC, + ); + isa = PBXGroup; + name = generic; + refType = 4; + }; + 00E2F856016E92B00ACA28DC = { + children = ( + F5F24F6B016ECAA401DC9062, + F5F24F6C016ECAA401DC9062, + F5F24F6D016ECAA401DC9062, + F5F24F6E016ECAA401DC9062, + F5F24F6F016ECAA401DC9062, + F5F24F70016ECAA401DC9062, + F5F24F71016ECAA401DC9062, + F5F24F72016ECAA401DC9062, + F5F24F73016ECAA401DC9062, + F5F24F74016ECAA401DC9062, + F5F24F75016ECAA401DC9062, + F5F24F76016ECAA401DC9062, + F5F24F77016ECAA401DC9062, + F5F24F78016ECAA401DC9062, + F5F24FD1016ECB1E01DC9062, + F5F24FD2016ECB1E01DC9062, + ); + isa = PBXGroup; + name = Headers; + refType = 4; + }; + 00E2F857016E92B00ACA28DC = { + children = ( + 00E2F858016E92B00ACA28DC, + 00E2F859016E92B00ACA28DC, + ); + isa = PBXGroup; + name = macosx; + refType = 4; + }; + 00E2F858016E92B00ACA28DC = { + children = ( + ); + isa = PBXGroup; + name = Headers; + refType = 4; + }; + 00E2F859016E92B00ACA28DC = { + children = ( + F5A1836F018242A501DC9062, + ); + isa = PBXGroup; + name = Sources; + refType = 4; + }; + 00E2F85A016E92B00ACA28DC = { + children = ( + 00E2F85B016E92B00ACA28DC, + 00E2F85C016E92B00ACA28DC, + ); + isa = PBXGroup; + name = unix; + refType = 4; + }; + 00E2F85B016E92B00ACA28DC = { + children = ( + F5F24FD6016ECC0F01DC9062, + F5F24FD7016ECC0F01DC9062, + ); + isa = PBXGroup; + name = Headers; + refType = 4; + }; + 00E2F85C016E92B00ACA28DC = { + children = ( + F5F24FD8016ECC0F01DC9062, + F5F24FD9016ECC0F01DC9062, + F5F24FDB016ECC0F01DC9062, + F5F24FDC016ECC0F01DC9062, + F5F24FDD016ECC0F01DC9062, + F5F24FDE016ECC0F01DC9062, + F5F24FDF016ECC0F01DC9062, + F5F24FE0016ECC0F01DC9062, + F5F24FE1016ECC0F01DC9062, + F5F24FE2016ECC0F01DC9062, + F5F24FE3016ECC0F01DC9062, + F5F24FE4016ECC0F01DC9062, + F5F24FE5016ECC0F01DC9062, + F5F24FE6016ECC0F01DC9062, + F5F24FE7016ECC0F01DC9062, + ); + isa = PBXGroup; + name = Sources; + refType = 4; + }; +//000 +//001 +//002 +//003 +//004 +//F50 +//F51 +//F52 +//F53 +//F54 + F50DC367017033D701DC9062 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + F50DC3680170344801DC9062 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXResourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + F50DC36A01703B7301DC9062 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + F53ACC5C031D9D11016F146B = { + isa = PBXExecutableFileReference; + name = tclsh8.4; + path = ../../build/tclsh8.4; + refType = 2; + }; + F53ACC73031DA405016F146B = { + isa = PBXExecutableFileReference; + name = tcltest; + path = ../../build/tcltest; + refType = 2; + }; + F5877EB5031F7997016F146B = { + isa = PBXTargetDependency; + target = 00E2F84B016E8A830ACA28DC; + }; + F5877EB6031F79A4016F146B = { + isa = PBXTargetDependency; + target = 00E2F84C016E8B780ACA28DC; + }; + F5877FB6031F97AF016F146B = { + buildActionMask = 8; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = /bin/sh; + shellScript = "# ensure we can overwrite a previous install\nif [ -d \"${INSTALL_ROOT}${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}\" ]; then\n chmod -RH u+w \"${INSTALL_ROOT}${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}\"\nfi"; + }; + F5877FBB031FA90A016F146B = { + buildActionMask = 8; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = /bin/sh; + shellScript = "# redo prebinding\nif [ ! -d \"${INSTALL_ROOT}/usr/lib\" ]; then ln -fs /usr/lib \"${INSTALL_ROOT}/usr/\"; RM_USRLIB=1; fi\nif [ ! -d \"${INSTALL_ROOT}/System\" ]; then ln -fs /System \"${INSTALL_ROOT}/\"; RM_SYSTEM=1; fi\nredo_prebinding -r \"${INSTALL_ROOT}\" \"${INSTALL_ROOT}/usr/bin/tclsh${FRAMEWORK_VERSION}\"\nif [ -n \"${RM_USRLIB:-}\" ]; then rm -f \"${INSTALL_ROOT}/usr/lib\"; fi\nif [ -n \"${RM_SYSTEM:-}\" ]; then rm -r ${INSTALL_ROOT}/System; fi"; + }; + F59AE5E3017AC67A01DC9062 = { + buildActionMask = 8; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = /bin/sh; + shellScript = "# build html documentation\nif [ \"${BUILD_STYLE}\" = \"Deployment\" ]; then\n cd \"${TEMP_DIR}/..\"\n make html DISTDIR=\"${INSTALL_ROOT}${LIBDIR}/Resources/English.lproj/Documentation/Reference\"\n cd \"${INSTALL_ROOT}${LIBDIR}/Resources/English.lproj/Documentation/Reference\"\n ln -fs contents.htm html/index.html\n rm -f \"${PRODUCT_NAME}\"; ln -fs html \"${PRODUCT_NAME}\"\nfi"; + }; + F5A1836F018242A501DC9062 = { + isa = PBXFileReference; + path = tclMacOSXBundle.c; + refType = 4; + }; + F5BE9BBF02FB5974016F146B = { + buildActionMask = 2147483647; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# symolic link hackery to trick\n# 'make install INSTALL_ROOT=${TEMP_DIR}'\n# into building Tcl.framework and tclsh in ${SYMROOT}\ncd \"${TEMP_DIR}\"\nmkdir -p Library\nmkdir -p usr\nrm -f Library/Frameworks; ln -fs \"${SYMROOT}\" Library/Frameworks\nrm -f usr/bin; ln -fs \"${SYMROOT}\" usr/bin\nln -fs \"${TEMP_DIR}/../tcltest\" \"${SYMROOT}\""; + }; + F5C88655017D604601DC9062 = { + children = ( + F5C88656017D604601DC9062, + F5C88657017D60C901DC9062, + F5C88658017D60C901DC9062, + ); + isa = PBXGroup; + name = "Header Tools"; + refType = 4; + }; + F5C88656017D604601DC9062 = { + isa = PBXFileReference; + name = genStubs.tcl; + path = ../tools/genStubs.tcl; + refType = 2; + }; + F5C88657017D60C901DC9062 = { + isa = PBXFileReference; + name = tcl.decls; + path = ../generic/tcl.decls; + refType = 2; + }; + F5C88658017D60C901DC9062 = { + isa = PBXFileReference; + name = tclInt.decls; + path = ../generic/tclInt.decls; + refType = 2; + }; + F5F24F6B016ECAA401DC9062 = { + isa = PBXFileReference; + name = regcustom.h; + path = ../generic/regcustom.h; + refType = 2; + }; + F5F24F6C016ECAA401DC9062 = { + isa = PBXFileReference; + name = regerrs.h; + path = ../generic/regerrs.h; + refType = 2; + }; + F5F24F6D016ECAA401DC9062 = { + isa = PBXFileReference; + name = regguts.h; + path = ../generic/regguts.h; + refType = 2; + }; + F5F24F6E016ECAA401DC9062 = { + isa = PBXFileReference; + name = tcl.h; + path = ../generic/tcl.h; + refType = 2; + }; + F5F24F6F016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclCompile.h; + path = ../generic/tclCompile.h; + refType = 2; + }; + F5F24F70016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclDecls.h; + path = ../generic/tclDecls.h; + refType = 2; + }; + F5F24F71016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclInitScript.h; + path = ../generic/tclInitScript.h; + refType = 2; + }; + F5F24F72016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclInt.h; + path = ../generic/tclInt.h; + refType = 2; + }; + F5F24F73016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclIntDecls.h; + path = ../generic/tclIntDecls.h; + refType = 2; + }; + F5F24F74016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclIntPlatDecls.h; + path = ../generic/tclIntPlatDecls.h; + refType = 2; + }; + F5F24F75016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclIO.h; + path = ../generic/tclIO.h; + refType = 2; + }; + F5F24F76016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclMath.h; + path = ../generic/tclMath.h; + refType = 2; + }; + F5F24F77016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclPlatDecls.h; + path = ../generic/tclPlatDecls.h; + refType = 2; + }; + F5F24F78016ECAA401DC9062 = { + isa = PBXFileReference; + name = tclRegexp.h; + path = ../generic/tclRegexp.h; + refType = 2; + }; + F5F24F87016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regc_color.c; + path = ../generic/regc_color.c; + refType = 2; + }; + F5F24F88016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regc_cvec.c; + path = ../generic/regc_cvec.c; + refType = 2; + }; + F5F24F89016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regc_lex.c; + path = ../generic/regc_lex.c; + refType = 2; + }; + F5F24F8A016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regc_locale.c; + path = ../generic/regc_locale.c; + refType = 2; + }; + F5F24F8B016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regc_nfa.c; + path = ../generic/regc_nfa.c; + refType = 2; + }; + F5F24F8C016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regcomp.c; + path = ../generic/regcomp.c; + refType = 2; + }; + F5F24F8D016ECAFC01DC9062 = { + isa = PBXFileReference; + name = rege_dfa.c; + path = ../generic/rege_dfa.c; + refType = 2; + }; + F5F24F8E016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regerror.c; + path = ../generic/regerror.c; + refType = 2; + }; + F5F24F8F016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regexec.c; + path = ../generic/regexec.c; + refType = 2; + }; + F5F24F90016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regfree.c; + path = ../generic/regfree.c; + refType = 2; + }; + F5F24F91016ECAFC01DC9062 = { + isa = PBXFileReference; + name = regfronts.c; + path = ../generic/regfronts.c; + refType = 2; + }; + F5F24F92016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclAlloc.c; + path = ../generic/tclAlloc.c; + refType = 2; + }; + F5F24F93016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclAsync.c; + path = ../generic/tclAsync.c; + refType = 2; + }; + F5F24F94016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclBasic.c; + path = ../generic/tclBasic.c; + refType = 2; + }; + F5F24F95016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclBinary.c; + path = ../generic/tclBinary.c; + refType = 2; + }; + F5F24F96016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCkalloc.c; + path = ../generic/tclCkalloc.c; + refType = 2; + }; + F5F24F97016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclClock.c; + path = ../generic/tclClock.c; + refType = 2; + }; + F5F24F98016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCmdAH.c; + path = ../generic/tclCmdAH.c; + refType = 2; + }; + F5F24F99016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCmdIL.c; + path = ../generic/tclCmdIL.c; + refType = 2; + }; + F5F24F9A016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCmdMZ.c; + path = ../generic/tclCmdMZ.c; + refType = 2; + }; + F5F24F9B016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCompCmds.c; + path = ../generic/tclCompCmds.c; + refType = 2; + }; + F5F24F9C016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCompExpr.c; + path = ../generic/tclCompExpr.c; + refType = 2; + }; + F5F24F9D016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclCompile.c; + path = ../generic/tclCompile.c; + refType = 2; + }; + F5F24F9E016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclDate.c; + path = ../generic/tclDate.c; + refType = 2; + }; + F5F24F9F016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclEncoding.c; + path = ../generic/tclEncoding.c; + refType = 2; + }; + F5F24FA0016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclEnv.c; + path = ../generic/tclEnv.c; + refType = 2; + }; + F5F24FA1016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclEvent.c; + path = ../generic/tclEvent.c; + refType = 2; + }; + F5F24FA2016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclExecute.c; + path = ../generic/tclExecute.c; + refType = 2; + }; + F5F24FA3016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclFCmd.c; + path = ../generic/tclFCmd.c; + refType = 2; + }; + F5F24FA4016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclFileName.c; + path = ../generic/tclFileName.c; + refType = 2; + }; + F5F24FA5016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclGet.c; + path = ../generic/tclGet.c; + refType = 2; + }; + F5F24FA6016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclHash.c; + path = ../generic/tclHash.c; + refType = 2; + }; + F5F24FA7016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclHistory.c; + path = ../generic/tclHistory.c; + refType = 2; + }; + F5F24FA8016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclIndexObj.c; + path = ../generic/tclIndexObj.c; + refType = 2; + }; + F5F24FA9016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclInterp.c; + path = ../generic/tclInterp.c; + refType = 2; + }; + F5F24FAA016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclIO.c; + path = ../generic/tclIO.c; + refType = 2; + }; + F5F24FAB016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclIOCmd.c; + path = ../generic/tclIOCmd.c; + refType = 2; + }; + F5F24FAC016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclIOGT.c; + path = ../generic/tclIOGT.c; + refType = 2; + }; + F5F24FAD016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclIOSock.c; + path = ../generic/tclIOSock.c; + refType = 2; + }; + F5F24FAE016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclIOUtil.c; + path = ../generic/tclIOUtil.c; + refType = 2; + }; + F5F24FAF016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclLink.c; + path = ../generic/tclLink.c; + refType = 2; + }; + F5F24FB0016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclListObj.c; + path = ../generic/tclListObj.c; + refType = 2; + }; + F5F24FB1016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclLiteral.c; + path = ../generic/tclLiteral.c; + refType = 2; + }; + F5F24FB2016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclLoad.c; + path = ../generic/tclLoad.c; + refType = 2; + }; + F5F24FB3016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclLoadNone.c; + path = ../generic/tclLoadNone.c; + refType = 2; + }; + F5F24FB4016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclMain.c; + path = ../generic/tclMain.c; + refType = 2; + }; + F5F24FB5016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclNamesp.c; + path = ../generic/tclNamesp.c; + refType = 2; + }; + F5F24FB6016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclNotify.c; + path = ../generic/tclNotify.c; + refType = 2; + }; + F5F24FB7016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclObj.c; + path = ../generic/tclObj.c; + refType = 2; + }; + F5F24FB8016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclPanic.c; + path = ../generic/tclPanic.c; + refType = 2; + }; + F5F24FB9016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclParse.c; + path = ../generic/tclParse.c; + refType = 2; + }; + F5F24FBA016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclParseExpr.c; + path = ../generic/tclParseExpr.c; + refType = 2; + }; + F5F24FBB016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclPipe.c; + path = ../generic/tclPipe.c; + refType = 2; + }; + F5F24FBC016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclPosixStr.c; + path = ../generic/tclPosixStr.c; + refType = 2; + }; + F5F24FBD016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclPreserve.c; + path = ../generic/tclPreserve.c; + refType = 2; + }; + F5F24FBE016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclProc.c; + path = ../generic/tclProc.c; + refType = 2; + }; + F5F24FBF016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclRegexp.c; + path = ../generic/tclRegexp.c; + refType = 2; + }; + F5F24FC0016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclResolve.c; + path = ../generic/tclResolve.c; + refType = 2; + }; + F5F24FC1016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclResult.c; + path = ../generic/tclResult.c; + refType = 2; + }; + F5F24FC2016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclScan.c; + path = ../generic/tclScan.c; + refType = 2; + }; + F5F24FC3016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclStringObj.c; + path = ../generic/tclStringObj.c; + refType = 2; + }; + F5F24FC4016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclStubInit.c; + path = ../generic/tclStubInit.c; + refType = 2; + }; + F5F24FC5016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclStubLib.c; + path = ../generic/tclStubLib.c; + refType = 2; + }; + F5F24FC6016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclTest.c; + path = ../generic/tclTest.c; + refType = 2; + }; + F5F24FC7016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclTestObj.c; + path = ../generic/tclTestObj.c; + refType = 2; + }; + F5F24FC8016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclTestProcBodyObj.c; + path = ../generic/tclTestProcBodyObj.c; + refType = 2; + }; + F5F24FC9016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclThread.c; + path = ../generic/tclThread.c; + refType = 2; + }; + F5F24FCA016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclThreadJoin.c; + path = ../generic/tclThreadJoin.c; + refType = 2; + }; + F5F24FCB016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclThreadTest.c; + path = ../generic/tclThreadTest.c; + refType = 2; + }; + F5F24FCC016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclTimer.c; + path = ../generic/tclTimer.c; + refType = 2; + }; + F5F24FCD016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclUniData.c; + path = ../generic/tclUniData.c; + refType = 2; + }; + F5F24FCE016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclUtf.c; + path = ../generic/tclUtf.c; + refType = 2; + }; + F5F24FCF016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclUtil.c; + path = ../generic/tclUtil.c; + refType = 2; + }; + F5F24FD0016ECAFC01DC9062 = { + isa = PBXFileReference; + name = tclVar.c; + path = ../generic/tclVar.c; + refType = 2; + }; + F5F24FD1016ECB1E01DC9062 = { + isa = PBXFileReference; + name = regex.h; + path = ../generic/regex.h; + refType = 2; + }; + F5F24FD2016ECB1E01DC9062 = { + isa = PBXFileReference; + name = tclPort.h; + path = ../generic/tclPort.h; + refType = 2; + }; + F5F24FD3016ECB4901DC9062 = { + isa = PBXFileReference; + name = tclPkg.c; + path = ../generic/tclPkg.c; + refType = 2; + }; + F5F24FD6016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixPort.h; + path = ../unix/tclUnixPort.h; + refType = 2; + }; + F5F24FD7016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixThrd.h; + path = ../unix/tclUnixThrd.h; + refType = 2; + }; + F5F24FD8016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclAppInit.c; + path = ../unix/tclAppInit.c; + refType = 2; + }; + F5F24FD9016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclLoadDyld.c; + path = ../unix/tclLoadDyld.c; + refType = 2; + }; + F5F24FDB016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixChan.c; + path = ../unix/tclUnixChan.c; + refType = 2; + }; + F5F24FDC016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixEvent.c; + path = ../unix/tclUnixEvent.c; + refType = 2; + }; + F5F24FDD016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixFCmd.c; + path = ../unix/tclUnixFCmd.c; + refType = 2; + }; + F5F24FDE016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixFile.c; + path = ../unix/tclUnixFile.c; + refType = 2; + }; + F5F24FDF016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixInit.c; + path = ../unix/tclUnixInit.c; + refType = 2; + }; + F5F24FE0016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixNotfy.c; + path = ../unix/tclUnixNotfy.c; + refType = 2; + }; + F5F24FE1016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixPipe.c; + path = ../unix/tclUnixPipe.c; + refType = 2; + }; + F5F24FE2016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixSock.c; + path = ../unix/tclUnixSock.c; + refType = 2; + }; + F5F24FE3016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixTest.c; + path = ../unix/tclUnixTest.c; + refType = 2; + }; + F5F24FE4016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixThrd.c; + path = ../unix/tclUnixThrd.c; + refType = 2; + }; + F5F24FE5016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclUnixTime.c; + path = ../unix/tclUnixTime.c; + refType = 2; + }; + F5F24FE6016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclXtNotify.c; + path = ../unix/tclXtNotify.c; + refType = 2; + }; + F5F24FE7016ECC0F01DC9062 = { + isa = PBXFileReference; + name = tclXtTest.c; + path = ../unix/tclXtTest.c; + refType = 2; + }; + F5F24FEE016ED0DF01DC9062 = { + children = ( + F5F24FEF016ED0DF01DC9062, + F5F24FF0016ED0DF01DC9062, + F5F24FF3016ED0DF01DC9062, + F5F24FF4016ED0DF01DC9062, + F5F24FF5016ED0DF01DC9062, + F5F24FF6016ED0DF01DC9062, + F5F24FFA016ED0DF01DC9062, + F5F24FFB016ED0DF01DC9062, + F5F24FFC016ED0DF01DC9062, + F5F24FFE016ED0DF01DC9062, + F5F25001016ED0DF01DC9062, + F5F25002016ED0DF01DC9062, + F5F25003016ED0DF01DC9062, + F5F25005016ED0DF01DC9062, + F5F25007016ED0DF01DC9062, + F5F25008016ED0DF01DC9062, + F5F2500A016ED0DF01DC9062, + ); + isa = PBXGroup; + name = Scripts; + refType = 4; + }; + F5F24FEF016ED0DF01DC9062 = { + isa = PBXFileReference; + name = auto.tcl; + path = ../library/auto.tcl; + refType = 2; + }; + F5F24FF0016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = dde; + path = ../library/dde; + refType = 2; + }; + F5F24FF3016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = encoding; + path = ../library/encoding; + refType = 2; + }; + F5F24FF4016ED0DF01DC9062 = { + isa = PBXFileReference; + name = history.tcl; + path = ../library/history.tcl; + refType = 2; + }; + F5F24FF5016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = http; + path = ../library/http; + refType = 2; + }; + F5F24FF6016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = http1.0; + path = ../library/http1.0; + refType = 2; + }; + F5F24FFA016ED0DF01DC9062 = { + isa = PBXFileReference; + name = init.tcl; + path = ../library/init.tcl; + refType = 2; + }; + F5F24FFB016ED0DF01DC9062 = { + isa = PBXFileReference; + name = ldAout.tcl; + path = ../library/ldAout.tcl; + refType = 2; + }; + F5F24FFC016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = msgcat; + path = ../library/msgcat; + refType = 2; + }; + F5F24FFE016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = opt; + path = ../library/opt; + refType = 2; + }; + F5F25001016ED0DF01DC9062 = { + isa = PBXFileReference; + name = package.tcl; + path = ../library/package.tcl; + refType = 2; + }; + F5F25002016ED0DF01DC9062 = { + isa = PBXFileReference; + name = parray.tcl; + path = ../library/parray.tcl; + refType = 2; + }; + F5F25003016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = reg; + path = ../library/reg; + refType = 2; + }; + F5F25005016ED0DF01DC9062 = { + isa = PBXFileReference; + name = safe.tcl; + path = ../library/safe.tcl; + refType = 2; + }; + F5F25007016ED0DF01DC9062 = { + isa = PBXFileReference; + name = tclIndex; + path = ../library/tclIndex; + refType = 2; + }; + F5F25008016ED0DF01DC9062 = { + includeInIndex = 0; + isa = PBXFolderReference; + name = tcltest; + path = ../library/tcltest; + refType = 2; + }; + F5F2500A016ED0DF01DC9062 = { + isa = PBXFileReference; + name = word.tcl; + path = ../library/word.tcl; + refType = 2; + }; + }; + rootObject = 00E2F845016E82EB0ACA28DC; +} diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c new file mode 100644 index 0000000..0761744 --- /dev/null +++ b/macosx/tclMacOSXBundle.c @@ -0,0 +1,128 @@ +/* + * tclMacOSXBundle.c -- + * + * This file implements functions that inspect CFBundle structures + * on MacOS X. + * + * Copyright 2001, Apple Computer, Inc. + * + * The following terms apply to all files originating from Apple + * Computer, Inc. ("Apple") and associated with the software + * unless explicitly disclaimed in individual files. + * + * + * Apple hereby grants permission to use, copy, modify, + * distribute, and license this software and its documentation + * for any purpose, provided that existing copyright notices are + * retained in all copies and that this notice is included + * verbatim in any distributions. No written agreement, license, + * or royalty fee is required for any of the authorized + * uses. Modifications to this software may be copyrighted by + * their authors and need not follow the licensing terms + * described here, provided that the new terms are clearly + * indicated on the first page of each file where they apply. + * + * + * IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE + * SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, + * INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF + * THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, + * EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. APPLE, THE AUTHORS AND + * DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS + * SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE + * AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE + * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * GOVERNMENT USE: If you are acquiring this software on behalf + * of the U.S. government, the Government shall have only + * "Restricted Rights" in the software and related documentation + * as defined in the Federal Acquisition Regulations (FARs) in + * Clause 52.227.19 (c) (2). If you are acquiring the software + * on behalf of the Department of Defense, the software shall be + * classified as "Commercial Computer Software" and the + * Government shall have only "Restricted Rights" as defined in + * Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the + * foregoing, the authors grant the U.S. Government and others + * acting in its behalf permission to use and distribute the + * software in accordance with the terms specified in this + * license. + */ + + #include + #include "tcl.h" + +/* + *---------------------------------------------------------------------- + * + * Tcl_MacOSXOpenBundleResources -- + * + * Given the bundle name for a shared library, this routine + * sets libraryPath to the Resources/Scripts directory + * in the framework package. If hasResourceFile is + * true, it will also open the main resource file for the bundle. + * + * + * Results: + * TCL_OK if the bundle could be opened, and the Scripts folder found. + * TCL_ERROR otherwise. + * + * Side effects: + * libraryVariableName may be set, and the resource file opened. + * + *---------------------------------------------------------------------- + */ + +int +Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp, + CONST char *bundleName, + int hasResourceFile, + int maxPathLen, + char *libraryPath) +{ + CFBundleRef bundleRef; + CFStringRef bundleNameRef; + + libraryPath[0] = '\0'; + + bundleNameRef = CFStringCreateWithCString(NULL, + bundleName, kCFStringEncodingUTF8); + + bundleRef = CFBundleGetBundleWithIdentifier(bundleNameRef); + CFRelease(bundleNameRef); + + if (bundleRef == 0) { + return TCL_ERROR; + } else { + CFURLRef libURL; + + if (hasResourceFile) { + short refNum; + refNum = CFBundleOpenBundleResourceMap(bundleRef); + } + + libURL = CFBundleCopyResourceURL(bundleRef, + CFSTR("Scripts"), + NULL, + NULL); + + if (libURL != NULL) { + /* + * FIXME: This is a quick fix, it is probably not right + * for internationalization. + */ + + if (CFURLGetFileSystemRepresentation (libURL, true, + libraryPath, maxPathLen)) { + } + CFRelease(libURL); + } else { + return TCL_ERROR; + } + } + + return TCL_OK; +} + diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index f11739e..73770ae 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: genStubs.tcl,v 1.11 2002/05/08 12:21:39 davygrvy Exp $ +# RCS: @(#) $Id: genStubs.tcl,v 1.12 2002/08/31 06:09:46 das Exp $ package require Tcl 8 @@ -122,7 +122,7 @@ proc genStubs::hooks {names} { # Arguments: # index The index number of the interface. # platform The platform the interface belongs to. Should be one -# of generic, win, unix, or mac. +# of generic, win, unix, or mac, or macosx or aqua or x11. # decl The C function declaration, or {} for an undefined # entry. # @@ -226,6 +226,15 @@ proc genStubs::addPlatformGuard {plat text} { mac { return "#ifdef MAC_TCL\n${text}#endif /* MAC_TCL */\n" } + macosx { + return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n" + } + aqua { + return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n" + } + x11 { + return "#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n" + } } return "$text" } @@ -615,6 +624,30 @@ proc genStubs::forAllStubs {name slotProc onAll textVar \ set emit 1 } } + # + # "aqua" and "macosx" and "x11" are special cases, + # since "macosx" always implies "unix" and "aqua", + # "macosx", so we need to be careful not to + # emit duplicate stubs entries for the two. + # + if {[info exists stubs($name,aqua,$i)] + && ![info exists stubs($name,macosx,$i)]} { + append text [addPlatformGuard aqua \ + [$slotProc $name $stubs($name,aqua,$i) $i]] + set emit 1 + } + if {[info exists stubs($name,macosx,$i)] + && ![info exists stubs($name,unix,$i)]} { + append text [addPlatformGuard macosx \ + [$slotProc $name $stubs($name,macosx,$i) $i]] + set emit 1 + } + if {[info exists stubs($name,x11,$i)] + && ![info exists stubs($name,unix,$i)]} { + append text [addPlatformGuard x11 \ + [$slotProc $name $stubs($name,x11,$i) $i]] + set emit 1 + } } if {$emit == 0} { eval {append text} $skipString @@ -637,8 +670,49 @@ proc genStubs::forAllStubs {name slotProc onAll textVar \ append text [addPlatformGuard $plat $temp] } } + # Again, make sure you don't duplicate entries for macosx & aqua. + if {[info exists stubs($name,aqua,lastNum)] + && ![info exists stubs($name,macosx,lastNum)]} { + set lastNum $stubs($name,aqua,lastNum) + set temp {} + for {set i 0} {$i <= $lastNum} {incr i} { + if {![info exists stubs($name,aqua,$i)]} { + eval {append temp} $skipString + } else { + append temp [$slotProc $name $stubs($name,aqua,$i) $i] + } + } + append text [addPlatformGuard aqua $temp] + } + # Again, make sure you don't duplicate entries for macosx & unix. + if {[info exists stubs($name,macosx,lastNum)] + && ![info exists stubs($name,unix,lastNum)]} { + set lastNum $stubs($name,macosx,lastNum) + set temp {} + for {set i 0} {$i <= $lastNum} {incr i} { + if {![info exists stubs($name,macosx,$i)]} { + eval {append temp} $skipString + } else { + append temp [$slotProc $name $stubs($name,macosx,$i) $i] + } + } + append text [addPlatformGuard macosx $temp] + } + # Again, make sure you don't duplicate entries for x11 & unix. + if {[info exists stubs($name,x11,lastNum)] + && ![info exists stubs($name,unix,lastNum)]} { + set lastNum $stubs($name,x11,lastNum) + set temp {} + for {set i 0} {$i <= $lastNum} {incr i} { + if {![info exists stubs($name,x11,$i)]} { + eval {append temp} $skipString + } else { + append temp [$slotProc $name $stubs($name,x11,$i) $i] + } + } + append text [addPlatformGuard x11 $temp] + } } - } # genStubs::emitDeclarations -- diff --git a/unix/Makefile.in b/unix/Makefile.in index 53b1deb..a8dc25b 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.114 2002/08/22 00:52:32 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.115 2002/08/31 06:09:46 das Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -195,6 +195,7 @@ SHLIB_LD = @SHLIB_LD@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ +TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ #SHLIB_SUFFIX = @@ -244,6 +245,7 @@ GENERIC_DIR = $(TOP_DIR)/generic COMPAT_DIR = $(TOP_DIR)/compat TOOL_DIR = $(TOP_DIR)/tools UNIX_DIR = $(TOP_DIR)/unix +MAC_OSX_DIR = $(TOP_DIR)/macosx # Must be absolute because of the cd dltest $(DLTEST_DIR)/configure below. DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest # Must be absolute to so the corresponding tcltest's tcl_library is absolute. @@ -314,7 +316,8 @@ GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \ STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS} -OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} @DL_OBJS@ +OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} \ + @DL_OBJS@ @PLAT_OBJS@ TCL_DECLS = \ $(GENERIC_DIR)/tcl.decls \ @@ -428,9 +431,12 @@ DL_SRCS = \ $(UNIX_DIR)/tclLoadOSF.c \ $(UNIX_DIR)/tclLoadShl.c -# Note: don't include DL_SRCS in SRCS: most of those files won't -# compile on the current machine, and they will cause problems for -# things like "make depend". +MAC_OSX_SRCS = \ + $(MAC_OSX_DIR)/tclMacOSXBundle.c + +# Note: don't include DL_SRCS or MAC_OSX_SRCS in SRCS: most of those +# files won't compile on the current machine, and they will cause +# problems for things like "make depend". SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) @@ -473,6 +479,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} # burned into its ld search path. This keeps tcltest from # picking up an already installed version of the Tcl library. +# Resetting the LIB_RUNTIME_DIR below is required so that +# the generated tcltest executable gets the build directory +# burned into its ld search path. This keeps tcltest from +# picking up an already installed version of the Tcl library. + tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST} $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd` @@ -488,58 +499,40 @@ tcltest-real: # % make test TESTFLAGS="-verbose bps -file fileName.test" test: tcltest - LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \ - DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}; export DYLD_LIBRARY_PATH; \ - LIBPATH=`pwd`:${LIBPATH}; export LIBPATH; \ - SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \ + @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ ./tcltest $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) $(TCLTESTARGS) # Useful target to launch a built tcltest with the proper path,... runtest: tcltest - LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \ - DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}; export DYLD_LIBRARY_PATH; \ - LIBPATH=`pwd`:${LIBPATH}; export LIBPATH; \ - SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \ + @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ ./tcltest # Useful target for running the test suite with an unwritable current # directory... ro-test: tcltest - LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \ - DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}; export DYLD_LIBRARY_PATH; \ - LIBPATH=`pwd`:${LIBPATH}; export LIBPATH; \ - SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \ + @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | ./tcltest # This target can be used to run tclsh from the build directory # via `make shell SCRIPT=/tmp/foo.tcl` shell: tclsh - @LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \ - DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}; export DYLD_LIBRARY_PATH; \ - LIBPATH=`pwd`:${LIBPATH}; export LIBPATH; \ - SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \ + @@LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ ./tclsh $(SCRIPT) # This target can be used to run tclsh inside either gdb or insight gdb: tclsh - @echo "set env LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}" > gdb.run - @echo "set env DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}" > gdb.run - @echo "set env LIBPATH=`pwd`:${LIBPATH}" >> gdb.run - @echo "set env SHLIB_PATH=`pwd`:${SHLIB_PATH}" >> gdb.run + @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}" > gdb.run @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run $(GDB) ./tclsh --command=gdb.run rm gdb.run # This target can be used to run tclsh inside ddd ddd: tclsh - @echo "set env LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}" > gdb.run - @echo "set env DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}" > gdb.run - @echo "set env LIBPATH=`pwd`:${LIBPATH}" >> gdb.run - @echo "set env SHLIB_PATH=`pwd`:${SHLIB_PATH}" >> gdb.run + @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}" > gdb.run @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run $(DDD) -command=gdb.run ./tclsh rm gdb.run @@ -1048,6 +1041,10 @@ tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c $(GENERIC_DIR)/tclInitScript.h tclConfi -DTCL_PACKAGE_PATH="\"${TCL_PACKAGE_PATH}\"" \ $(UNIX_DIR)/tclUnixInit.c +# This is the CFBundle interface. It is only used on Mac OS X. +tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMacOSXBundle.c + $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tclMacOSXBundle.c + # The following targets are not completely general. They are provide # purely for documentation purposes so people who are interested in # the Xt based notifier can modify them to suit their own installation. diff --git a/unix/configure b/unix/configure index d7a92ec..c55ce9f 100755 --- a/unix/configure +++ b/unix/configure @@ -33,6 +33,8 @@ ac_help="$ac_help --enable-symbols build with debugging symbols [--disable-symbols]" ac_help="$ac_help --enable-memdebug build with memory debugging [--disable-memdebug]" +ac_help="$ac_help + --enable-framework package shared libraries in frameworks [--disable-framework]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -571,7 +573,7 @@ TCL_SRC_DIR=`cd $srcdir/..; pwd` echo $ac_n "checking whether to use symlinks for manpages""... $ac_c" 1>&6 -echo "configure:575: checking whether to use symlinks for manpages" >&5 +echo "configure:577: checking whether to use symlinks for manpages" >&5 # Check whether --enable-man-symlinks or --disable-man-symlinks was given. if test "${enable_man_symlinks+set}" = set; then enableval="$enable_man_symlinks" @@ -583,7 +585,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking compression for manpages""... $ac_c" 1>&6 -echo "configure:587: checking compression for manpages" >&5 +echo "configure:589: checking compression for manpages" >&5 # Check whether --enable-man-compression or --disable-man-compression was given. if test "${enable_man_compression+set}" = set; then enableval="$enable_man_compression" @@ -611,7 +613,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:615: checking for $ac_word" >&5 +echo "configure:617: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -641,7 +643,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:645: checking for $ac_word" >&5 +echo "configure:647: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -692,7 +694,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:696: checking for $ac_word" >&5 +echo "configure:698: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -724,7 +726,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -735,12 +737,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 739 "configure" +#line 741 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -766,12 +768,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:775: checking whether we are using GNU C" >&5 +echo "configure:777: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -780,7 +782,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -799,7 +801,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:803: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:805: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -831,7 +833,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:835: checking how to run the C preprocessor" >&5 +echo "configure:837: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -846,13 +848,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -863,13 +865,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -880,13 +882,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -914,17 +916,17 @@ for ac_hdr in unistd.h limits.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:918: checking for $ac_hdr" >&5 +echo "configure:920: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -957,7 +959,7 @@ done echo $ac_n "checking for building with threads""... $ac_c" 1>&6 -echo "configure:961: checking for building with threads" >&5 +echo "configure:963: checking for building with threads" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -989,7 +991,7 @@ EOF EOF echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:993: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:995: checking for pthread_mutex_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -997,7 +999,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1036,7 +1038,7 @@ fi # pthread.h, but that will work with libpthread really doesn't # exist, like AIX 4.2. [Bug: 4359] echo $ac_n "checking for __pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1040: checking for __pthread_mutex_init in -lpthread" >&5 +echo "configure:1042: checking for __pthread_mutex_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1044,7 +1046,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1083,7 +1085,7 @@ fi THREADS_LIBS=" -lpthread" else echo $ac_n "checking for pthread_mutex_init in -lpthreads""... $ac_c" 1>&6 -echo "configure:1087: checking for pthread_mutex_init in -lpthreads" >&5 +echo "configure:1089: checking for pthread_mutex_init in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1091,7 +1093,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1128,7 +1130,7 @@ fi THREADS_LIBS=" -lpthreads" else echo $ac_n "checking for pthread_mutex_init in -lc""... $ac_c" 1>&6 -echo "configure:1132: checking for pthread_mutex_init in -lc" >&5 +echo "configure:1134: checking for pthread_mutex_init in -lc" >&5 ac_lib_var=`echo c'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1136,7 +1138,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1170,7 +1172,7 @@ fi if test "$tcl_ok" = "no"; then echo $ac_n "checking for pthread_mutex_init in -lc_r""... $ac_c" 1>&6 -echo "configure:1174: checking for pthread_mutex_init in -lc_r" >&5 +echo "configure:1176: checking for pthread_mutex_init in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1178,7 +1180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1227,12 +1229,12 @@ fi for ac_func in pthread_attr_setstacksize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1231: checking for $ac_func" >&5 +echo "configure:1233: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1282,12 +1284,12 @@ done for ac_func in readdir_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1286: checking for $ac_func" >&5 +echo "configure:1288: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1349,18 +1351,18 @@ done if test -z "$no_pipe"; then if test -n "$GCC"; then echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6 -echo "configure:1353: checking if the compiler understands -pipe" >&5 +echo "configure:1355: checking if the compiler understands -pipe" >&5 OLDCC="$CC" CC="$CC -pipe" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -1380,21 +1382,21 @@ fi echo $ac_n "checking for required early compiler flags""... $ac_c" 1>&6 -echo "configure:1384: checking for required early compiler flags" >&5 +echo "configure:1386: checking for required early compiler flags" >&5 tcl_flags="" if eval "test \"`echo '$''{'tcl_cv_flag__isoc99_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:1398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=no else @@ -1402,7 +1404,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1410,7 +1412,7 @@ int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=yes else @@ -1436,14 +1438,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:1447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=no else @@ -1451,7 +1453,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1459,7 +1461,7 @@ int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:1463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=yes else @@ -1488,20 +1490,20 @@ EOF echo $ac_n "checking for 64-bit integer type""... $ac_c" 1>&6 -echo "configure:1492: checking for 64-bit integer type" >&5 +echo "configure:1494: checking for 64-bit integer type" >&5 if eval "test \"`echo '$''{'tcl_cv_type_64bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_64bit=__int64 else @@ -1513,13 +1515,13 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main() {exit(!(sizeof(long long) > sizeof(long)));} EOF -if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_type_64bit="long long" else @@ -1544,13 +1546,13 @@ EOF # Now check for auxiliary declarations echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6 -echo "configure:1548: checking for struct dirent64" >&5 +echo "configure:1550: checking for struct dirent64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_dirent64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1558,7 +1560,7 @@ int main() { struct dirent64 p; ; return 0; } EOF -if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_dirent64=yes else @@ -1579,13 +1581,13 @@ EOF echo "$ac_t""${tcl_cv_struct_dirent64}" 1>&6 echo $ac_n "checking for struct stat64""... $ac_c" 1>&6 -echo "configure:1583: checking for struct stat64" >&5 +echo "configure:1585: checking for struct stat64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_stat64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1593,7 +1595,7 @@ struct stat64 p; ; return 0; } EOF -if { (eval echo configure:1597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_stat64=yes else @@ -1614,13 +1616,13 @@ EOF echo "$ac_t""${tcl_cv_struct_stat64}" 1>&6 echo $ac_n "checking for off64_t""... $ac_c" 1>&6 -echo "configure:1618: checking for off64_t" >&5 +echo "configure:1620: checking for off64_t" >&5 if eval "test \"`echo '$''{'tcl_cv_type_off64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1628,7 +1630,7 @@ off64_t offset; ; return 0; } EOF -if { (eval echo configure:1632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_off64_t=yes else @@ -1655,14 +1657,14 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1659: checking whether byte ordering is bigendian" >&5 +echo "configure:1661: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1673,11 +1675,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1688,7 +1690,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1708,7 +1710,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1754,12 +1756,12 @@ fi for ac_func in getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1758: checking for $ac_func" >&5 +echo "configure:1760: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1816,12 +1818,12 @@ done for ac_func in opendir strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1820: checking for $ac_func" >&5 +echo "configure:1822: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1874,12 +1876,12 @@ done for ac_func in strtol strtoll strtoull tmpnam waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1878: checking for $ac_func" >&5 +echo "configure:1880: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1929,12 +1931,12 @@ done echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:1933: checking for strerror" >&5 +echo "configure:1935: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -1981,12 +1983,12 @@ EOF fi echo $ac_n "checking for getwd""... $ac_c" 1>&6 -echo "configure:1985: checking for getwd" >&5 +echo "configure:1987: checking for getwd" >&5 if eval "test \"`echo '$''{'ac_cv_func_getwd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getwd=yes" else @@ -2033,12 +2035,12 @@ EOF fi echo $ac_n "checking for wait3""... $ac_c" 1>&6 -echo "configure:2037: checking for wait3" >&5 +echo "configure:2039: checking for wait3" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_wait3=yes" else @@ -2085,12 +2087,12 @@ EOF fi echo $ac_n "checking for uname""... $ac_c" 1>&6 -echo "configure:2089: checking for uname" >&5 +echo "configure:2091: checking for uname" >&5 if eval "test \"`echo '$''{'ac_cv_func_uname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_uname=yes" else @@ -2137,12 +2139,12 @@ EOF fi echo $ac_n "checking for realpath""... $ac_c" 1>&6 -echo "configure:2141: checking for realpath" >&5 +echo "configure:2143: checking for realpath" >&5 if eval "test \"`echo '$''{'ac_cv_func_realpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_realpath=yes" else @@ -2200,9 +2202,9 @@ fi echo $ac_n "checking dirent.h""... $ac_c" 1>&6 -echo "configure:2204: checking dirent.h" >&5 +echo "configure:2206: checking dirent.h" >&5 cat > conftest.$ac_ext < #include @@ -2228,7 +2230,7 @@ closedir(d); ; return 0; } EOF -if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_ok=yes else @@ -2249,17 +2251,17 @@ EOF echo "$ac_t""$tcl_ok" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:2253: checking for errno.h" >&5 +echo "configure:2255: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2286,17 +2288,17 @@ fi ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for float.h""... $ac_c" 1>&6 -echo "configure:2290: checking for float.h" >&5 +echo "configure:2292: checking for float.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2323,17 +2325,17 @@ fi ac_safe=`echo "values.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for values.h""... $ac_c" 1>&6 -echo "configure:2327: checking for values.h" >&5 +echo "configure:2329: checking for values.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2360,17 +2362,17 @@ fi ac_safe=`echo "limits.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for limits.h""... $ac_c" 1>&6 -echo "configure:2364: checking for limits.h" >&5 +echo "configure:2366: checking for limits.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2397,17 +2399,17 @@ fi ac_safe=`echo "stdlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6 -echo "configure:2401: checking for stdlib.h" >&5 +echo "configure:2403: checking for stdlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2430,7 +2432,7 @@ tcl_ok=0 fi cat > conftest.$ac_ext < EOF @@ -2444,7 +2446,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -2458,7 +2460,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -2479,17 +2481,17 @@ EOF fi ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:2483: checking for string.h" >&5 +echo "configure:2485: checking for string.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2512,7 +2514,7 @@ tcl_ok=0 fi cat > conftest.$ac_ext < EOF @@ -2526,7 +2528,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -2552,17 +2554,17 @@ EOF ac_safe=`echo "sys/wait.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/wait.h""... $ac_c" 1>&6 -echo "configure:2556: checking for sys/wait.h" >&5 +echo "configure:2558: checking for sys/wait.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2589,17 +2591,17 @@ fi ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:2593: checking for dlfcn.h" >&5 +echo "configure:2595: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2631,17 +2633,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2635: checking for $ac_hdr" >&5 +echo "configure:2637: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2681,17 +2683,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2685: checking for $ac_hdr" >&5 +echo "configure:2687: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2718,7 +2720,7 @@ fi done echo $ac_n "checking termios vs. termio vs. sgtty""... $ac_c" 1>&6 -echo "configure:2722: checking termios vs. termio vs. sgtty" >&5 +echo "configure:2724: checking termios vs. termio vs. sgtty" >&5 if eval "test \"`echo '$''{'tcl_cv_api_serial'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2727,7 +2729,7 @@ else tcl_cv_api_serial=no else cat > conftest.$ac_ext < @@ -2742,7 +2744,7 @@ int main() { return 1; } EOF -if { (eval echo configure:2746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_api_serial=termios else @@ -2759,7 +2761,7 @@ fi tcl_cv_api_serial=no else cat > conftest.$ac_ext < @@ -2773,7 +2775,7 @@ int main() { return 1; } EOF -if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_api_serial=termio else @@ -2791,7 +2793,7 @@ fi tcl_cv_api_serial=no else cat > conftest.$ac_ext < @@ -2806,7 +2808,7 @@ int main() { return 1; } EOF -if { (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_api_serial=sgtty else @@ -2824,7 +2826,7 @@ fi tcl_cv_api_serial=no else cat > conftest.$ac_ext < @@ -2841,7 +2843,7 @@ int main() { return 1; } EOF -if { (eval echo configure:2845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_api_serial=termios else @@ -2859,7 +2861,7 @@ fi tcl_cv_api_serial=no else cat > conftest.$ac_ext < @@ -2875,7 +2877,7 @@ int main() { return 1; } EOF -if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_api_serial=termio else @@ -2893,7 +2895,7 @@ fi tcl_cv_api_serial=none else cat > conftest.$ac_ext < @@ -2910,7 +2912,7 @@ int main() { return 1; } EOF -if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_api_serial=sgtty else @@ -2953,19 +2955,19 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking for fd_set in sys/types""... $ac_c" 1>&6 -echo "configure:2957: checking for fd_set in sys/types" >&5 +echo "configure:2959: checking for fd_set in sys/types" >&5 if eval "test \"`echo '$''{'tcl_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:2969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_fd_set=yes else @@ -2981,12 +2983,12 @@ echo "$ac_t""$tcl_cv_type_fd_set" 1>&6 tk_ok=$tcl_cv_type_fd_set if test $tcl_cv_type_fd_set = no; then echo $ac_n "checking for fd_mask in sys/select""... $ac_c" 1>&6 -echo "configure:2985: checking for fd_mask in sys/select" >&5 +echo "configure:2987: checking for fd_mask in sys/select" >&5 if eval "test \"`echo '$''{'tcl_cv_grep_fd_mask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3023,12 +3025,12 @@ fi #------------------------------------------------------------------------------ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3027: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3029: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3036,7 +3038,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3061,17 +3063,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3065: checking for $ac_hdr" >&5 +echo "configure:3067: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3098,12 +3100,12 @@ fi done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3102: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3104: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3112,7 +3114,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3133,12 +3135,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3137: checking for tm_zone in struct tm" >&5 +echo "configure:3139: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3146,7 +3148,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3166,12 +3168,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3170: checking for tzname" >&5 +echo "configure:3172: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3181,7 +3183,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3206,12 +3208,12 @@ fi for ac_func in gmtime_r localtime_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3210: checking for $ac_func" >&5 +echo "configure:3212: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3260,19 +3262,19 @@ done echo $ac_n "checking tm_tzadj in struct tm""... $ac_c" 1>&6 -echo "configure:3264: checking tm_tzadj in struct tm" >&5 +echo "configure:3266: checking tm_tzadj in struct tm" >&5 if eval "test \"`echo '$''{'tcl_cv_member_tm_tzadj'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct tm tm; tm.tm_tzadj; ; return 0; } EOF -if { (eval echo configure:3276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_member_tm_tzadj=yes else @@ -3293,19 +3295,19 @@ EOF fi echo $ac_n "checking tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3297: checking tm_gmtoff in struct tm" >&5 +echo "configure:3299: checking tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'tcl_cv_member_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct tm tm; tm.tm_gmtoff; ; return 0; } EOF -if { (eval echo configure:3309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_member_tm_gmtoff=yes else @@ -3330,12 +3332,12 @@ EOF # (like convex) have timezone functions, etc. # echo $ac_n "checking long timezone variable""... $ac_c" 1>&6 -echo "configure:3334: checking long timezone variable" >&5 +echo "configure:3336: checking long timezone variable" >&5 if eval "test \"`echo '$''{'tcl_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3344,7 +3346,7 @@ extern long timezone; exit (0); ; return 0; } EOF -if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_timezone_long=yes else @@ -3367,12 +3369,12 @@ EOF # On some systems (eg IRIX 6.2), timezone is a time_t and not a long. # echo $ac_n "checking time_t timezone variable""... $ac_c" 1>&6 -echo "configure:3371: checking time_t timezone variable" >&5 +echo "configure:3373: checking time_t timezone variable" >&5 if eval "test \"`echo '$''{'tcl_cv_timezone_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3381,7 +3383,7 @@ extern time_t timezone; exit (0); ; return 0; } EOF -if { (eval echo configure:3385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_timezone_time=yes else @@ -3408,12 +3410,12 @@ EOF # in struct stat. But we might be able to use fstatfs instead. #-------------------------------------------------------------------- echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:3412: checking for st_blksize in struct stat" >&5 +echo "configure:3414: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3421,7 +3423,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:3425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -3442,12 +3444,12 @@ EOF fi echo $ac_n "checking for fstatfs""... $ac_c" 1>&6 -echo "configure:3446: checking for fstatfs" >&5 +echo "configure:3448: checking for fstatfs" >&5 if eval "test \"`echo '$''{'ac_cv_func_fstatfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fstatfs=yes" else @@ -3499,7 +3501,7 @@ fi # data, this checks it and add memcmp.o to LIBOBJS if needed #-------------------------------------------------------------------- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3503: checking for 8-bit clean memcmp" >&5 +echo "configure:3505: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3507,7 +3509,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3541,12 +3543,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" # {The replacement define is in compat/string.h} #-------------------------------------------------------------------- echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:3545: checking for memmove" >&5 +echo "configure:3547: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_memmove=yes" else @@ -3602,12 +3604,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking proper strstr implementation""... $ac_c" 1>&6 -echo "configure:3606: checking proper strstr implementation" >&5 +echo "configure:3608: checking proper strstr implementation" >&5 if test "$cross_compiling" = yes; then tcl_ok=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_ok=yes else @@ -3643,12 +3645,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:3647: checking for strtoul" >&5 +echo "configure:3649: checking for strtoul" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtoul=yes" else @@ -3695,7 +3697,7 @@ if test "$cross_compiling" = yes; then tcl_ok=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3734,12 +3736,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for strtod""... $ac_c" 1>&6 -echo "configure:3738: checking for strtod" >&5 +echo "configure:3740: checking for strtod" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtod=yes" else @@ -3786,7 +3788,7 @@ if test "$cross_compiling" = yes; then tcl_ok=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3828,12 +3830,12 @@ fi echo $ac_n "checking for strtod""... $ac_c" 1>&6 -echo "configure:3832: checking for strtod" >&5 +echo "configure:3834: checking for strtod" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtod=yes" else @@ -3878,7 +3880,7 @@ fi if test "$tcl_strtod" = 1; then echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6 -echo "configure:3882: checking for Solaris2.4/Tru64 strtod bugs" >&5 +echo "configure:3884: checking for Solaris2.4/Tru64 strtod bugs" >&5 if eval "test \"`echo '$''{'tcl_cv_strtod_buggy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3887,7 +3889,7 @@ else tcl_cv_strtod_buggy=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_strtod_buggy=1 else @@ -3943,12 +3945,12 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3947: checking for ANSI C header files" >&5 +echo "configure:3949: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3956,7 +3958,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3973,7 +3975,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3991,7 +3993,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4012,7 +4014,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4023,7 +4025,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4047,12 +4049,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4051: checking for mode_t" >&5 +echo "configure:4053: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4080,12 +4082,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4084: checking for pid_t" >&5 +echo "configure:4086: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4113,12 +4115,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4117: checking for size_t" >&5 +echo "configure:4119: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4146,12 +4148,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4150: checking for uid_t in sys/types.h" >&5 +echo "configure:4152: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4181,12 +4183,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4185: checking for socklen_t" >&5 +echo "configure:4187: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4225,12 +4227,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4229: checking for opendir" >&5 +echo "configure:4231: checking for opendir" >&5 if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4286,12 +4288,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking union wait""... $ac_c" 1>&6 -echo "configure:4290: checking union wait" >&5 +echo "configure:4292: checking union wait" >&5 if eval "test \"`echo '$''{'tcl_cv_union_wait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4303,7 +4305,7 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED ; return 0; } EOF -if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_union_wait=yes else @@ -4330,12 +4332,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for strncasecmp""... $ac_c" 1>&6 -echo "configure:4334: checking for strncasecmp" >&5 +echo "configure:4336: checking for strncasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strncasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strncasecmp=yes" else @@ -4380,7 +4382,7 @@ fi if test "$tcl_ok" = 0; then echo $ac_n "checking for strncasecmp in -lsocket""... $ac_c" 1>&6 -echo "configure:4384: checking for strncasecmp in -lsocket" >&5 +echo "configure:4386: checking for strncasecmp in -lsocket" >&5 ac_lib_var=`echo socket'_'strncasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4388,7 +4390,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4423,7 +4425,7 @@ fi fi if test "$tcl_ok" = 0; then echo $ac_n "checking for strncasecmp in -linet""... $ac_c" 1>&6 -echo "configure:4427: checking for strncasecmp in -linet" >&5 +echo "configure:4429: checking for strncasecmp in -linet" >&5 ac_lib_var=`echo inet'_'strncasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4431,7 +4433,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4480,12 +4482,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for BSDgettimeofday""... $ac_c" 1>&6 -echo "configure:4484: checking for BSDgettimeofday" >&5 +echo "configure:4486: checking for BSDgettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_BSDgettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_BSDgettimeofday=yes" else @@ -4530,12 +4532,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 -echo "configure:4534: checking for gettimeofday" >&5 +echo "configure:4536: checking for gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettimeofday=yes" else @@ -4585,12 +4587,12 @@ fi fi echo $ac_n "checking for gettimeofday declaration""... $ac_c" 1>&6 -echo "configure:4589: checking for gettimeofday declaration" >&5 +echo "configure:4591: checking for gettimeofday declaration" >&5 if eval "test \"`echo '$''{'tcl_cv_grep_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4621,14 +4623,14 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:4625: checking whether char is unsigned" >&5 +echo "configure:4627: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -4684,12 +4686,12 @@ EOF fi echo $ac_n "checking signed char declarations""... $ac_c" 1>&6 -echo "configure:4688: checking signed char declarations" >&5 +echo "configure:4690: checking signed char declarations" >&5 if eval "test \"`echo '$''{'tcl_cv_char_signed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_char_signed=yes else @@ -4724,7 +4726,7 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for a putenv() that copies the buffer""... $ac_c" 1>&6 -echo "configure:4728: checking for a putenv() that copies the buffer" >&5 +echo "configure:4730: checking for a putenv() that copies the buffer" >&5 if eval "test \"`echo '$''{'tcl_cv_putenv_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4732,7 +4734,7 @@ else tcl_cv_putenv_copy=no else cat > conftest.$ac_ext < @@ -4754,7 +4756,7 @@ else } EOF -if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_putenv_copy=no else @@ -4796,17 +4798,17 @@ fi if test "$langinfo_ok" = "yes"; then ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:4800: checking for langinfo.h" >&5 +echo "configure:4802: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4831,17 +4833,17 @@ fi fi fi echo $ac_n "checking whether to use nl_langinfo""... $ac_c" 1>&6 -echo "configure:4835: checking whether to use nl_langinfo" >&5 +echo "configure:4837: checking whether to use nl_langinfo" >&5 if test "$langinfo_ok" = "yes"; then cat > conftest.$ac_ext < int main() { nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:4845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* langinfo_ok=yes else @@ -4877,12 +4879,12 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4881: checking for sin" >&5 +echo "configure:4883: checking for sin" >&5 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@ -4926,7 +4928,7 @@ MATH_LIBS="-lm" fi echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 -echo "configure:4930: checking for main in -lieee" >&5 +echo "configure:4932: checking for main in -lieee" >&5 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4934,14 +4936,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4968,7 +4970,7 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:4972: checking for main in -linet" >&5 +echo "configure:4974: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4976,14 +4978,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5005,17 +5007,17 @@ fi ac_safe=`echo "net/errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for net/errno.h""... $ac_c" 1>&6 -echo "configure:5009: checking for net/errno.h" >&5 +echo "configure:5011: checking for net/errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5060,12 +5062,12 @@ fi tcl_checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5064: checking for connect" >&5 +echo "configure:5066: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5110,12 +5112,12 @@ fi if test "$tcl_checkSocket" = 1; then echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 -echo "configure:5114: checking for setsockopt" >&5 +echo "configure:5116: checking for setsockopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setsockopt=yes" else @@ -5156,7 +5158,7 @@ if eval "test \"`echo '$ac_cv_func_'setsockopt`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 -echo "configure:5160: checking for setsockopt in -lsocket" >&5 +echo "configure:5162: checking for setsockopt in -lsocket" >&5 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5164,7 +5166,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5203,12 +5205,12 @@ fi tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:5207: checking for accept" >&5 +echo "configure:5209: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -5253,12 +5255,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5257: checking for gethostbyname" >&5 +echo "configure:5259: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5299,7 +5301,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5303: checking for gethostbyname in -lnsl" >&5 +echo "configure:5305: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5307,7 +5309,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5355,7 +5357,7 @@ LIBS="$LIBS$THREADS_LIBS" echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 -echo "configure:5359: checking how to build libraries" >&5 +echo "configure:5361: checking how to build libraries" >&5 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -5394,7 +5396,7 @@ EOF # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5398: checking for $ac_word" >&5 +echo "configure:5400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5426,7 +5428,7 @@ fi # Step 0.a: Enable 64 bit support? echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6 -echo "configure:5430: checking if 64bit support is requested" >&5 +echo "configure:5432: checking if 64bit support is requested" >&5 # Check whether --enable-64bit or --disable-64bit was given. if test "${enable_64bit+set}" = set; then enableval="$enable_64bit" @@ -5446,7 +5448,7 @@ fi # Step 0.b: Enable Solaris 64 bit VIS support? echo $ac_n "checking if 64bit Sparc VIS support is requested""... $ac_c" 1>&6 -echo "configure:5450: checking if 64bit Sparc VIS support is requested" >&5 +echo "configure:5452: checking if 64bit Sparc VIS support is requested" >&5 # Check whether --enable-64bit-vis or --disable-64bit-vis was given. if test "${enable_64bit_vis+set}" = set; then enableval="$enable_64bit_vis" @@ -5470,7 +5472,7 @@ fi # there are a few systems, like Next, where this doesn't work. echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6 -echo "configure:5474: checking system version (for dynamic loading)" >&5 +echo "configure:5476: checking system version (for dynamic loading)" >&5 if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` else @@ -5496,7 +5498,7 @@ echo "configure:5474: checking system version (for dynamic loading)" >&5 # Linux can use either -ldl or -ldld for dynamic loading. echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5500: checking for dlopen in -ldl" >&5 +echo "configure:5502: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5504,7 +5506,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5559,7 +5561,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5563: checking for $ac_word" >&5 +echo "configure:5565: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5586,6 +5588,8 @@ else fi STLIB_LD='${AR} cr' + LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" + PLAT_OBJS="" case $system in AIX-5.*) if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then @@ -5616,6 +5620,7 @@ fi CC_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' + LD_LIBRARY_PATH_VAR="LIBPATH" # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes" ; then @@ -5646,6 +5651,7 @@ fi LDFLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + LD_LIBRARY_PATH_VAR="LIBPATH" TCL_NEEDS_EXP_FILE=1 TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp' @@ -5668,7 +5674,7 @@ fi # known GMT value. echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 -echo "configure:5672: checking for gettimeofday in -lbsd" >&5 +echo "configure:5678: checking for gettimeofday in -lbsd" >&5 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5676,7 +5682,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5769,7 +5775,7 @@ EOF SHLIB_SUFFIX=".sl" echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:5773: checking for shl_load in -ldld" >&5 +echo "configure:5779: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5777,7 +5783,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5818,6 +5824,7 @@ fi LDFLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi # Check to enable 64-bit flags for compiler/linker @@ -5834,7 +5841,7 @@ fi HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:5838: checking for shl_load in -ldld" >&5 +echo "configure:5845: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5842,7 +5849,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5883,6 +5890,7 @@ fi LDFLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi ;; IRIX-4.*) @@ -5980,17 +5988,17 @@ fi else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:5984: checking for dld.h" >&5 +echo "configure:5992: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6049,17 +6057,17 @@ fi else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:6053: checking for dld.h" >&5 +echo "configure:6061: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6117,17 +6125,17 @@ fi # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:6121: checking for dlfcn.h" >&5 +echo "configure:6129: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6155,9 +6163,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' echo $ac_n "checking for ELF""... $ac_c" 1>&6 -echo "configure:6159: checking for ELF" >&5 +echo "configure:6167: checking for ELF" >&5 cat > conftest.$ac_ext <&6 -echo "configure:6511: checking for ld accepts -Bexport flag" >&5 +echo "configure:6524: checking for ld accepts -Bexport flag" >&5 LDFLAGS="${LDFLAGS} -Wl,-Bexport" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* found=yes else @@ -6564,9 +6577,9 @@ rm -f conftest* if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 -echo "configure:6568: checking sys/exec.h" >&5 +echo "configure:6581: checking sys/exec.h" >&5 cat > conftest.$ac_ext < int main() { @@ -6584,7 +6597,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@ -6602,9 +6615,9 @@ EOF else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 -echo "configure:6606: checking a.out.h" >&5 +echo "configure:6619: checking a.out.h" >&5 cat > conftest.$ac_ext < int main() { @@ -6622,7 +6635,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@ -6640,9 +6653,9 @@ EOF else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 -echo "configure:6644: checking sys/exec_aout.h" >&5 +echo "configure:6657: checking sys/exec_aout.h" >&5 cat > conftest.$ac_ext < int main() { @@ -6660,7 +6673,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@ -6754,7 +6767,7 @@ fi if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${LD_SEARCH_FLAGS}' + MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} @@ -6787,6 +6800,8 @@ fi + + @@ -6800,6 +6815,7 @@ fi + @@ -6810,7 +6826,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:6814: checking for build with symbols" >&5 +echo "configure:6830: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -6836,7 +6852,7 @@ fi echo $ac_n "checking for build with memory debugging""... $ac_c" 1>&6 -echo "configure:6840: checking for build with memory debugging" >&5 +echo "configure:6856: checking for build with memory debugging" >&5 # Check whether --enable-memdebug or --disable-memdebug was given. if test "${enable_memdebug+set}" = set; then enableval="$enable_memdebug" @@ -6869,17 +6885,17 @@ TCL_DBGX=${DBGX} do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6873: checking for $ac_hdr" >&5 +echo "configure:6889: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6909,17 +6925,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6913: checking for $ac_hdr" >&5 +echo "configure:6929: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6946,7 +6962,7 @@ fi done echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6 -echo "configure:6950: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 +echo "configure:6966: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` else @@ -7007,6 +7023,38 @@ TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX} eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" + + echo $ac_n "checking how to package libraries""... $ac_c" 1>&6 +echo "configure:7029: checking how to package libraries" >&5 + # Check whether --enable-framework or --disable-framework was given. +if test "${enable_framework+set}" = set; then + enableval="$enable_framework" + tcl_ok=$enableval +else + tcl_ok=no +fi + + + if test "${enable_framework+set}" = set; then + enableval="$enable_framework" + tcl_ok=$enableval + else + tcl_ok=no + fi + + if test "$tcl_ok" = "yes" ; then + echo "$ac_t""framework" 1>&6 + FRAMEWORK_BUILD=1 + if test "${SHARED_BUILD}" = "0" ; then + echo "configure: warning: "Frameworks can only be built if --enable-shared is yes"" 1>&2 + FRAMEWORK_BUILD=0 + fi + else + echo "$ac_t""standard shared library" 1>&6 + FRAMEWORK_BUILD=0 + fi + + # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed # so that the backslashes quoting the DBX braces are dropped. @@ -7019,7 +7067,11 @@ eval "TCL_LIB_FILE=${TCL_LIB_FILE}" # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. -if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then +if test "$FRAMEWORK_BUILD" = "1" ; then + TCL_BUILD_LIB_SPEC="-F`pwd` -framework Tcl" + TCL_LIB_SPEC="-framework Tcl" + TCL_LIB_FILE="Tcl" +elif test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" else @@ -7055,7 +7107,9 @@ VERSION=${TCL_VERSION} # another for platform-independent scripts. #-------------------------------------------------------------------- -if test "$prefix" != "$exec_prefix"; then +if test "$FRAMEWORK_BUILD" = "1" ; then + TCL_PACKAGE_PATH="${libdir}/Resources/Scripts" +elif test "$prefix" != "$exec_prefix"; then TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" else TCL_PACKAGE_PATH="${prefix}/lib" @@ -7130,7 +7184,6 @@ TCL_SHARED_BUILD=${SHARED_BUILD} - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -7285,6 +7338,8 @@ s%@MATH_LIBS@%$MATH_LIBS%g s%@AR@%$AR%g s%@RANLIB@%$RANLIB%g s%@DL_LIBS@%$DL_LIBS%g +s%@DL_OBJS@%$DL_OBJS%g +s%@PLAT_OBJS@%$PLAT_OBJS%g s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g @@ -7295,6 +7350,7 @@ s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g s%@STLIB_LD@%$STLIB_LD%g s%@SHLIB_LD@%$SHLIB_LD%g +s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g s%@SHLIB_LD_FLAGS@%$SHLIB_LD_FLAGS%g s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g @@ -7325,8 +7381,8 @@ s%@TCL_DBGX@%$TCL_DBGX%g s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g -s%@DL_OBJS@%$DL_OBJS%g s%@TCL_SHARED_BUILD@%$TCL_SHARED_BUILD%g +s%@LD_LIBRARY_PATH_VAR@%$LD_LIBRARY_PATH_VAR%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g s%@TCL_NEEDS_EXP_FILE@%$TCL_NEEDS_EXP_FILE%g s%@TCL_BUILD_EXP_FILE@%$TCL_BUILD_EXP_FILE%g diff --git a/unix/configure.in b/unix/configure.in index b1d6918..1ef5729 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.100 2002/08/28 22:48:39 davygrvy Exp $ +# RCS: @(#) $Id: configure.in,v 1.101 2002/08/31 06:09:46 das Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.13) @@ -455,6 +455,8 @@ TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX} eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +SC_ENABLE_FRAMEWORK + # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed # so that the backslashes quoting the DBX braces are dropped. @@ -467,7 +469,11 @@ eval "TCL_LIB_FILE=${TCL_LIB_FILE}" # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. -if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then +if test "$FRAMEWORK_BUILD" = "1" ; then + TCL_BUILD_LIB_SPEC="-F`pwd` -framework Tcl" + TCL_LIB_SPEC="-framework Tcl" + TCL_LIB_FILE="Tcl" +elif test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" else @@ -503,7 +509,9 @@ VERSION=${TCL_VERSION} # another for platform-independent scripts. #-------------------------------------------------------------------- -if test "$prefix" != "$exec_prefix"; then +if test "$FRAMEWORK_BUILD" = "1" ; then + TCL_PACKAGE_PATH="${libdir}/Resources/Scripts" +elif test "$prefix" != "$exec_prefix"; then TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" else TCL_PACKAGE_PATH="${prefix}/lib" @@ -561,9 +569,8 @@ AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX) AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX) AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX) -AC_SUBST(DL_OBJS) - AC_SUBST(TCL_SHARED_BUILD) +AC_SUBST(LD_LIBRARY_PATH_VAR) AC_SUBST(TCL_BUILD_LIB_SPEC) AC_SUBST(TCL_NEEDS_EXP_FILE) diff --git a/unix/tcl.m4 b/unix/tcl.m4 index d386101..08e2edb 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -334,6 +334,49 @@ AC_DEFUN(SC_ENABLE_SHARED, [ ]) #------------------------------------------------------------------------ +# SC_ENABLE_FRAMEWORK -- +# +# Allows the building of shared libraries into frameworks +# +# Arguments: +# none +# +# Results: +# +# Adds the following arguments to configure: +# --enable-framework=yes|no +# +# Sets the following vars: +# FRAMEWORK_BUILD Value of 1 or 0 +#------------------------------------------------------------------------ + +AC_DEFUN(SC_ENABLE_FRAMEWORK, [ + AC_MSG_CHECKING([how to package libraries]) + AC_ARG_ENABLE(framework, + [ --enable-framework package shared libraries in frameworks [--disable-framework]], + [tcl_ok=$enableval], [tcl_ok=no]) + + if test "${enable_framework+set}" = set; then + enableval="$enable_framework" + tcl_ok=$enableval + else + tcl_ok=no + fi + + if test "$tcl_ok" = "yes" ; then + AC_MSG_RESULT([framework]) + FRAMEWORK_BUILD=1 + if test "${SHARED_BUILD}" = "0" ; then + AC_MSG_WARN("Frameworks can only be built if --enable-shared is yes") + FRAMEWORK_BUILD=0 + fi + else + AC_MSG_RESULT([standard shared library]) + FRAMEWORK_BUILD=0 + fi +]) + +#------------------------------------------------------------------------ # SC_ENABLE_THREADS -- # # Specify if thread support should be enabled @@ -646,6 +689,13 @@ AC_DEFUN(SC_ENABLE_MEMDEBUG, [ # SHLIB_SUFFIX - Suffix to use for the names of dynamically loadable # extensions. An empty string means we don't know how # to use shared libraries on this platform. +# TCL_SHLIB_LD_EXTRAS - Additional element which are added to SHLIB_LD_LIBS +# for the build of TCL, but not recorded in the +# tclConfig.sh, since they are only used for the build +# of Tcl. +# Examples: MacOS X records the library version and +# compatibility version in the shared library. But +# of course the Tcl version of this is only used for Tcl. # LIB_SUFFIX - Specifies everything that comes after the "libfoo" # in a static or shared library name, using the $VERSION variable # to put the version in the right place. This is used @@ -756,6 +806,8 @@ dnl FIXME: Replace AC_CHECK_PROG with AC_CHECK_TOOL once cross compiling is fixe dnl AC_CHECK_TOOL(AR, ar, :) AC_CHECK_PROG(AR, ar, ar) STLIB_LD='${AR} cr' + LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" + PLAT_OBJS="" case $system in AIX-5.*) if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then @@ -786,6 +838,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) CC_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' + LD_LIBRARY_PATH_VAR="LIBPATH" # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes" ; then @@ -816,6 +869,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) LDFLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + LD_LIBRARY_PATH_VAR="LIBPATH" TCL_NEEDS_EXP_FILE=1 TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp' @@ -902,6 +956,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) LDFLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi # Check to enable 64-bit flags for compiler/linker @@ -927,6 +982,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) LDFLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi ;; IRIX-4.*) @@ -1162,16 +1218,21 @@ dnl AC_CHECK_TOOL(AR, ar, :) Rhapsody-*|Darwin-*) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" - SHLIB_LD_FLAGS="-compatibility_version \${MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${LIB_FILE} -prebind -seg1addr a000000" + TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" + PLAT_OBJS="tclMacOSXBundle.o" DL_LIBS="" LDFLAGS="-prebind" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - CFLAGS_OPTIMIZE="-O2" - EXTRA_CFLAGS='-DTCL_DEFAULT_ENCODING=\"utf-8\"' + CFLAGS_OPTIMIZE="-Os" + LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" + # for compatibility with autoconf vers 2.13 : + HACK="" + EXTRA_CFLAGS="-DMA${HACK}C_OSX_TCL -DHAVE_CFBUNDLE -DTCL_DEFAULT_ENCODING=\\\"utf-8\\\"" + LIBS="$LIBS -framework CoreFoundation" ;; NEXTSTEP-*) SHLIB_CFLAGS="" @@ -1586,7 +1647,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${LD_SEARCH_FLAGS}' + MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} @@ -1627,6 +1688,8 @@ dnl esac AC_SUBST(DL_LIBS) + AC_SUBST(DL_OBJS) + AC_SUBST(PLAT_OBJS) AC_SUBST(CFLAGS) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) @@ -1641,6 +1704,7 @@ dnl esac AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) + AC_SUBST(TCL_SHLIB_LD_EXTRAS) AC_SUBST(SHLIB_LD_FLAGS) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index e0f202d..a3978cc 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -7,9 +7,12 @@ * Copyright (c) 1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclUnixInit.c,v 1.31 2002/02/12 14:31:54 davygrvy Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.32 2002/08/31 06:09:46 das Exp $ */ +#if defined(HAVE_CFBUNDLE) +#include +#endif #include "tclInt.h" #include "tclPort.h" #include @@ -136,6 +139,9 @@ static CONST LocaleTable localeTable[] = { {NULL, NULL} }; + +static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath); + /* *--------------------------------------------------------------------------- @@ -394,11 +400,22 @@ CONST char *path; /* Path to the executable in native * is different from the prtefix. */ - str = defaultLibraryDir; + { +#ifdef HAVE_CFBUNDLE + char tclLibPath[1024]; + + if (Tcl_MacOSXGetLibraryPath(NULL, 1024, tclLibPath) == TCL_OK) { + str = tclLibPath; + } else +#endif /* HAVE_CFBUNDLE */ + { + str = defaultLibraryDir; + } if (str[0] != '\0') { objPtr = Tcl_NewStringObj(str, -1); Tcl_ListObjAppendElement(NULL, pathPtr, objPtr); } + } TclSetLibraryPath(pathPtr); Tcl_DStringFree(&buffer); @@ -680,8 +697,26 @@ TclpSetVariables(interp) CONST char *user; Tcl_DString ds; - Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY); +#ifdef HAVE_CFBUNDLE + char tclLibPath[1024]; + + if (Tcl_MacOSXGetLibraryPath(interp, 1024, tclLibPath) == TCL_OK) { + Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, + TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, + TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "tcl_pkgPath", " ", + TCL_GLOBAL_ONLY | TCL_APPEND_VALUE); + Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, + TCL_GLOBAL_ONLY | TCL_APPEND_VALUE); + } else +#endif /* HAVE_CFBUNDLE */ + { + Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, + TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY); + } + #ifdef DJGPP Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY); #else @@ -930,3 +965,33 @@ TclpCheckStackSpace() return 1; } + +/* + *---------------------------------------------------------------------- + * + * Tcl_MacOSXGetLibraryPath -- + * + * If we have a bundle structure for the Tcl installation, + * then check there first to see if we can find the libraries + * there. + * + * Results: + * TCL_OK if we have found the tcl library; TCL_ERROR otherwise. + * + * Side effects: + * Same as for Tcl_MacOSXOpenBundleResources. + * + *---------------------------------------------------------------------- + */ +static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath) +{ + int foundInFramework = TCL_ERROR; +#ifdef HAVE_CFBUNDLE + if (strcmp(defaultLibraryDir, "@TCL_IN_FRAMEWORK@") == 0) { + foundInFramework = Tcl_MacOSXOpenBundleResources(interp, + "com.tcltk.tcllibrary", 0, maxPathLen, tclLibPath); + } +#endif /* HAVE_CFBUNDLE */ + return foundInFramework; +} + diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index f376746..94be5a0 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixNotfy.c,v 1.10 2000/04/24 23:32:13 hobbs Exp $ + * RCS: @(#) $Id: tclUnixNotfy.c,v 1.11 2002/08/31 06:09:46 das Exp $ */ #include "tclInt.h" @@ -973,7 +973,6 @@ NotifierThreadProc(clientData) } if (found || (tsdPtr->pollState & POLL_DONE)) { tsdPtr->eventReady = 1; - Tcl_ConditionNotify(&tsdPtr->waitCV); if (tsdPtr->onList) { /* * Remove the ThreadSpecificData structure of this @@ -994,6 +993,7 @@ NotifierThreadProc(clientData) tsdPtr->onList = 0; tsdPtr->pollState = 0; } + Tcl_ConditionNotify(&tsdPtr->waitCV); } } Tcl_MutexUnlock(¬ifierMutex); -- cgit v0.12