* unix/tcl.m4 (Darwin): add 64bit support, check for Tiger copyfile(),

	add CFLAGS to SHLIB_LD to support passing -isysroot in env(CFLAGS) to
	configure (flag can't be present twice, so can't be in both CFLAGS and
	LDFLAGS during configure), don't use -prebind when deploying on 10.4,
	define TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING (rdar://3171542).
	(SC_ENABLE_LANGINFO, SC_TIME_HANDLER): add/fix caching, fix obsolete
	autoconf macros. Sync with tk/unix/tcl.m4, sync whitespace with HEAD.

	* unix/configure.in: fix obsolete autoconf macros, sync gratuitous
	formatting/ordering differences with tk/unix/configure.in.

	* unix/Makefile.in: add CFLAGS to tclsh/tcltest link to make executable
	linking the same as during configure (needed to avoid loosing any linker
	relevant flags in CFLAGS, in particular flags that can't be in LDFLAGS).
	Avoid concurrent linking of tclsh and compiling of tclTestInit.o or
	xtTestInit.o during parallel make.
	(checkstubs, checkdoc, checkexports): dependency and Darwin fixes

	* unix/tclLoadDyld.c (TclpDlopen): use NSADDIMAGE_OPTION_WITH_SEARCHING
	on second NSAddImage only. [Bug 1204237]
	(TclGuessPackageName): should not be MODULE_SCOPE.
	(TclpLoadMemory): ppc64 and endian (i386) fixes, add support for loading
	universal (fat) bundles from memory.

	* unix/tclUnixPort.h:
	* unix/tclUnixFCmd.c: add support for new Tiger copyfile() API to enable
	copying of xattrs & ACLs by [file copy].

	* generic/tcl.h: add Darwin specifc configure overrides for TCL_WIDE
	defines to support fat compiles of ppc and ppc64 at the same time,
	(replaces Darwin CVS fix by emoy, rdar://3693001).
	add/correct location of version numbers in macosx files.

	* generic/tclInt.h: clarify fat compile comment.

	* unix/tclUnixPort.h: add Darwin specifc configure overrides to support
	fat compiles, where configure runs only once for multiple architectures
	(replaces Darwin CVS fix by emoy, rdar://3693001).

	* macosx/tclMacOSXBundle.c:
	* macosx/tclMacOSXNotify.c:
	* unix/tclUnixNotfy.c:
	* unix/tclUnixPort.h: fix #include order to support compile time
	override of HAVE_COREFOUNDATION in tclUnixPort.h when building for ppc64

	* macosx/Tcl.pbproj/default.pbxuser (new file):
	* macosx/Tcl.pbproj/jingham.pbxuser:
	* macosx/Tcl.pbproj/project.pbxproj: sync with HEAD.

	* macosx/README: clarification/cleanup, sync with HEAD, document
	universal (fat) builds via CFLAGS (i.e. all of ppc ppc64 i386 at once).

	* macosx/Makefile: add support for reusing configure cache, build target
	fixes, remove GENERIC_FLAGS override now handled by tcl.m4.

	* generic/tclIOUtil.c:
	* generic/tclRegexp.c:
	* generic/tclVar.c: declare globals used only in own file as static
	(sync with HEAD).

	* generic/rege_dfa.c (getvacant):
	* generic/regexec.c (cfind):
	* generic/tclCompExpr.c (CompileSubExpr):
	* unix/tclUnixChan.c (TclUnixWaitForFile): initialise variables to
	silence gcc 4 warnings.

	* generic/regguts.h: only #define NDEBUG if not already #defined.

	* macosx/tclMacOSXNotify.c: sync whitespace & comments with HEAD

	* unix/configure: regen.

1 files changed, 79 insertions, 63 deletions

diff --git a/macosx/README b/macosx/README
index 7c0d4ee..46469cb 100644
--- a/macosx/README
+++ b/macosx/README
@@ -1,107 +1,123 @@
-Tcl MacOSX README 
+Tcl Mac OS X README 
 -----------------
 
-RCS: @(#) $Id: README,v 1.1.2.3 2005/05/24 04:20:08 das Exp $
+RCS: @(#) $Id: README,v 1.1.2.4 2005/11/27 02:34:41 das Exp $
 
-This is the README file for the Mac OS X native version of Tcl (framework build).
+This is the README file for the Mac OS X/Darwin version of Tcl.
 
 
-1. General
-----------
+1. Where to go for support
+--------------------------
 
-- The tcl-mac mailing list on sourceforge is the canonical place for questions
+- The tcl-mac mailing list on sourceforge is the best place to ask questions
 specific to Tcl & Tk on Mac OS X:
 	http://lists.sourceforge.net/lists/listinfo/tcl-mac
 (this page also has a link to searchable archives of the list, please check them
 before asking on the list, many questions have already been answered).
 
-- For general tcl/tk questions, the newsgroup comp.lang.tcl is your best bet,
-but also check the Tcl'ers Wiki for a wealth of information:
-	http://wiki.tcl.tk/
+- For general Tcl/Tk questions, the newsgroup comp.lang.tcl is your best bet:
+	http://groups.google.com/group/comp.lang.tcl/
 
-- The wiki has a page listing known bugs in Mac OS X Tcl/Tk (and other tips)
-	http://wiki.tcl.tk/MacOS%20X
-as well as a page with info on building Tcl/Tk on Mac OS X
-	http://wiki.tcl.tk/Steps%20to%20build%20Tcl/Tk%208.4.0%20on%20MacOS%20X
+- The Tcl'ers Wiki also has many pages dealing with Tcl & Tk on Mac OS X, see
+	http://wiki.tcl.tk/references/3753!
+	http://wiki.tcl.tk/references/8361!
 
-- You should report bugs to the sourceforge bug trackers as usual: 
-	Tcl: https://sourceforge.net/tracker/?func=add&group_id=10894&atid=110894
-	Tk:  https://sourceforge.net/tracker/?func=add&group_id=12997&atid=112997
-please make sure that your report Tk specific bugs to the tktoolkit bug
-tracker and not the tcl one.
+- Please report bugs with Tcl or Tk on Mac OS X to the sourceforge bug trackers:
+	Tcl: http://sf.net/tracker/?func=add&group_id=10894&atid=110894
+	Tk:  http://sf.net/tracker/?func=add&group_id=12997&atid=112997
+please make sure that your report Tk specific bugs to the tktoolkit project bug
+tracker rather than the tcl project bug tracker.
+Mac OS X specific bugs should usually be assigned to 'das' or 'wolfsuit'.
 
 
-2. Using Tcl on MacOSX
-----------------------
+2. Using Tcl on Mac OS X
+------------------------
 
-- Mac OS X 10.2 (or higher) is required to run Tcl on MacOSX.
+- At a minimum, Mac OS X 10.1 is required to run Tcl, but OS X 10.3 or higher is
+recommended (certain [file] operations behave incorrectly on earlier releases).
 
-- Tcl built on Mac OS X 10.3 or higher will not run on 10.2 due to missing
-symbols in libSystem, however Tcl built on 10.2 will run on 10.3 (but without
-prebinding and other optimizations).
+- Tcl built on Mac OS X 10.x will not run on 10.y for y < x, on the other hand
+Tcl built on 10.y will run on 10.x for y < x (but without any of the fixes and
+optimizations that would be available in a binary built on 10.x).
 
-- Tcl extensions will be found in any of:
+- Tcl extensions can be installed in any of:
 	$HOME/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl
 	$HOME/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks
 	/System/Library/Frameworks (searched in that order).
 Given a potential package directory $pkg, Tcl on OSX checks for the file
 $pkg/Resources/Scripts/pkgIndex.tcl as well as the usual $pkg/pkgIndex.tcl.
-This allows building extensions as frameworks with all script files contained
-in the Resources/Scripts directory of the framework.
+This allows building extensions as frameworks with all script files contained in
+the Resources/Scripts directory of the framework.
 
-- The Tcl framework contains documentation in html format in the
-standard location for frameworks:
+- [load]able binary extensions can linked as either ordinary shared libraries
+(.dylib) or as MachO bundles (since 8.4.10/8.5a3); only bundles can be unloaded,
+and bundles are also loaded more efficiently from VFS (no temporary copy to the
+native filesystem required).
+
+- The 'deploy' target of macosx/Makefile installs the html manpages into the
+standard documentation location in the Tcl framework:
 	Tcl.framework/Resources/Documentation/Reference/Tcl
-No manpages are installed by default.
+No nroff manpages are installed by default by the Makefile.
 
-- the framework Tcl.framework can be placed in any of the system's standard
+- The Tcl framework can be installed in any of the system's standard
 framework directories:
 	$HOME/Library/Frameworks /Library/Frameworks
 	/Network/Library/Frameworks /System/Library/Frameworks
-and /usr/bin/tclsh will work.
-
-- the format of binary extensions expected by [load] is that of ordinary shared
-libraries (.dylib) and not MachO bundles, at present loading of MachO bundles is
-not supported.
 
 
-3. Building Tcl.framework
--------------------------
+3. Building Tcl on Mac OS X
+---------------------------
 
-- Mac OS X 10.2 (or higher) is required to build Tcl on MacOSX.
-
-- Apple's Developer Tools CD needs to be installed (the most recent version
-matching your OS release, but no earlier than December 2002). This CD should
-have come with Mac OS X retail or should be present as a disk image on new macs
-that came with OSX preinstalled. It can also be downloaded from
+- At least Mac OS X 10.1 is required to build Tcl, and Apple's Developer Tools
+need to be installed (only the most recent version matching your OS release is
+supported). The Developer Tools installer is available on Mac OS X retail disks
+or is present in /Applications/Installers on Macs that came with OS X
+preinstalled. The most recent version can be downloaded from the ADC website
 http://connect.apple.com (after you register for free ADC membership).
 
-- Tcl is built as a Mac OS X framework via the Makefile in tcl/macosx, but can
-but can also be built directly with the standard unix configure and make
-buildsystem in tcl/unix.
-
-- It is still possible to build with Apple's Xcode IDE using the Tcl.pbproj
-project but this is not recommended anymore (currently Tcl.pbproj calls through
-to the tcl/macosx/Makefile so there should be no build differences).
+- Tcl is most easily built as a Mac OS X framework via Makefile in tcl/macosx
+(see below for details), but can also be built with the standard unix configure
+and make buildsystem in tcl/unix as on any other unix platform (indeed, the
+Makefile is just a wrapper around the unix buildsystem).
+The Mac OS X specifc configure flags are --enable-framework and
+--disable-corefoundation (which disables CF and notably reverts to the standard
+select based notifier, you will only need this if your require use of naked fork
+(i.e. not followed by execve) in an unthreaded core).
+
+- It is also possible to build with Apple's IDE via the tcl/macosx/Tcl.pbproj
+project, this simply calls through to the tcl/macosx/GNUMakefile.
+
+- To build universal binaires, set CFLAGS as follows:
+    export CFLAGS="-arch ppc -arch ppc64 -arch i386 \
+	-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+This requires Mac OS X 10.4 and Xcode 2.2 (_not_ Xcode 2.1) and will work on any
+of the architectures (on i386 DTKs, the -isysroot is not required). Note that it
+is not possible to configure correctly if the current architecture is not
+present in CFLAGS (i.e. -arch `arch` must always be there). Universal builds of
+Tcl TEA extensions are also possible with CFLAGS set as above, they will be
+[load]able by universal as well as thin binaries of Tcl.
+
+Detailed Instructions for building with macosx/Makefile
+-------------------------------------------------------
 
 - Unpack the tcl source release archive.
 
-- The following instructions assume the tcl source tree is named "tcl${ver}", 
-where ${ver} is a shell variable containing the tcl version number (for 
-example '8.4.2').
+- The following instructions assume the tcl source tree is named "tcl${ver}",
+where ${ver} is a shell variable containing the tcl version number (for example
+'8.4.12').
 Setup the shell variable as follows:
-	set ver="8.4.2" ;: if your shell is csh
-	ver="8.4.2"     ;: if your shell is sh
+	set ver="8.4.12" ;: if your shell is csh
+	ver="8.4.12"     ;: if your shell is sh
 The source tree will be named this way only if you are building from a release
 archive, if you are building from CVS, the version numbers will be missing; so
 set ${ver} to the empty string instead:
-	set ver=""     ;: if your shell is csh
-	ver=""         ;: if your shell is sh
+	set ver=""       ;: if your shell is csh
+	ver=""           ;: if your shell is sh
 
-- The following steps will build Tcl from the Terminal, assuming you are
-located in the directory containing the tcl source tree:
+- The following steps will build Tcl from the Terminal, assuming you are located
+in the directory containing the tcl source tree:
 	make -C tcl${ver}/macosx
-and the following will then install Tcl onto the root volume (admin password 
+and the following will then install Tcl onto the root volume (admin password
 required):
 	sudo make -C tcl${ver}/macosx install
 if you don't have the admin password, you can install into your home directory,
@@ -109,8 +125,8 @@ instead by passing an INSTALL_ROOT argument to make:
 	make -C tcl${ver}/macosx install INSTALL_ROOT="${HOME}/"
 
 - The default Makefile targets will build _both_ debug and optimized versions of
-the Tcl framework with the standard convention of naming the debug
-library Tcl.framework/Tcl_debug.
+the Tcl framework with the standard convention of naming the debug library
+Tcl.framework/Tcl_debug.
 This allows you to dynamically link to the debug libraries at runtime by setting
 	setenv DYLD_IMAGE_SUFFIX _debug
 (c.f. man dyld for more details)