* unix/Makefile.in: add support for --enable-aqua=carbon

	* unix/configure.in:		configure option (legacy fallback for
					pre-Mac OS X 10.5 releases).

	* unix/configure:		autoconf-2.59

1 files changed, 20 insertions, 11 deletions

diff --git a/unix/configure.in b/unix/configure.in
index 4feb5fb..1cae725 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 Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.164 2009/04/10 18:01:39 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.165 2009/06/26 01:42:05 das Exp $
 
 AC_INIT([tk],[8.6])
 AC_PREREQ(2.59)
@@ -262,13 +262,14 @@ fi
 #	On Mac OS X, we can build either with X11 or with Aqua
 #--------------------------------------------------------------------
 
+MACOSX_SRC_DIR=macosx
 if test "`uname -s`" = "Darwin" ; then
     AC_MSG_CHECKING([whether to use Aqua])
     AC_ARG_ENABLE(aqua,
-	AC_HELP_STRING([--enable-aqua],
-	    [use Aqua windowingsystem on Mac OS X (default: off)]),
+	AC_HELP_STRING([--enable-aqua=yes|carbon|no],
+	    [use Aqua windowingsystem on Mac OS X (default: no)]),
 	[tk_aqua=$enableval], [tk_aqua=no])
-    if test $tk_aqua = yes; then
+    if test $tk_aqua = yes -o $tk_aqua = carbon; then
 	if test $tcl_corefoundation = no; then
 	    AC_MSG_WARN([Aqua can only be used when CoreFoundation is available])
 	    tk_aqua=no
@@ -281,8 +282,15 @@ if test "`uname -s`" = "Darwin" ; then
 	    AC_MSG_WARN([Aqua requires Mac OS X 10.2 or later])
 	    tk_aqua=no
 	fi
+    else
+	tk_aqua=no
+    fi
+    if test $tk_aqua = carbon; then
+	MACOSX_SRC_DIR=carbon
+	AC_MSG_RESULT([yes (deprecated legacy Carbon implementation)])
+    else
+	AC_MSG_RESULT([$tk_aqua])
     fi
-    AC_MSG_RESULT([$tk_aqua])
     if test "$fat_32_64" = yes; then
 	if test $tk_aqua = no; then
 	    AC_CACHE_CHECK([for 64-bit X11], tcl_cv_lib_x11_64, [
@@ -299,7 +307,7 @@ if test "`uname -s`" = "Darwin" ; then
 	fi
 	# remove 64-bit arch flags from CFLAGS et al. for combined 32 & 64 bit
 	# fat builds if configuration does not support 64-bit.
-	if test $tk_aqua = yes -o "$tcl_cv_lib_x11_64" = no; then
+	if test $tk_aqua != no -o "$tcl_cv_lib_x11_64" = no; then
 	    AC_MSG_NOTICE([Removing 64-bit architectures from compiler & linker flags])
 	    for v in CFLAGS CPPFLAGS LDFLAGS; do
 		eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
@@ -358,7 +366,7 @@ else
     tk_aqua=no
 fi
 
-if test $tk_aqua = yes; then
+if test $tk_aqua != no; then
     AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
     LIBS="$LIBS -framework Carbon -framework IOKit"
     CFLAGS="$CFLAGS -fpascal-strings"
@@ -612,7 +620,7 @@ if test "`uname -s`" = "Darwin" ; then
     TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
     EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
     EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
-    AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in])
+    AC_CONFIG_FILES([Tk-Info.plist:../${MACOSX_SRC_DIR}/Tk-Info.plist.in Wish-Info.plist:../${MACOSX_SRC_DIR}/Wish-Info.plist.in])
     for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
     TK_YEAR="`date +%Y`"
 fi
@@ -626,7 +634,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
         rm -rf $f && mkdir -p $f/$v/Resources &&
         ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
         ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist &&
-        if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
+        if test $tk_aqua != no; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
         unset n f v
     ], VERSION=${TK_VERSION} && tk_aqua=${tk_aqua})
     LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
@@ -650,7 +658,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html' 
     EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources" && mkdir -p "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
-    if test $tk_aqua = yes; then
+    if test $tk_aqua != no; then
         EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing ${TK_RSRC_FILE} to $(LIB_INSTALL_DIR)/Resources" && mkdir -p "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) "${TK_RSRC_FILE}" "$(LIB_INSTALL_DIR)/Resources"'
         EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing wish$(VERSION) script to $(INSTALL_ROOT)/'"${bindir}"'" && mkdir -p "$(INSTALL_ROOT)/'"${bindir}"'" && printf > "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)" "#!/bin/sh\n\"\$$(dirname \$$0)'"`eval d="${bindir}"; echo "$d" | sed -e 's#/[^/][^/]*#/..#g'`"'$(bindir)/Wish\" \"\$$@\"" && chmod +x "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)"'
         bindir="${libdir}/Resources/Wish.app/Contents/MacOS"
@@ -690,7 +698,7 @@ else
 fi
 
 # Support for building the Aqua resource files
-if test $tk_aqua = yes; then
+if test $tk_aqua != no; then
     LIB_RSRC_FILE='${TK_RSRC_FILE}'
     APP_RSRC_FILE='${WISH_RSRC_FILE}'
     REZ=/Developer/Tools/Rez
@@ -778,6 +786,7 @@ AC_SUBST(EXTRA_BUILD_HTML)
 AC_SUBST(EXTRA_WISH_LIBS)
 AC_SUBST(CFBUNDLELOCALIZATIONS)
 
+AC_SUBST(MACOSX_SRC_DIR)
 AC_SUBST(TK_RSRC_FILE)
 AC_SUBST(WISH_RSRC_FILE)
 AC_SUBST(LIB_RSRC_FILE)