Index: Makefile.in
===================================================================
RCS file: /cvsroot/tktable/tile/Makefile.in,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile.in
--- Makefile.in	2 Jul 2004 00:10:37 -0000	1.20
+++ Makefile.in	31 Jul 2004 00:46:13 -0000
@@ -47,7 +47,7 @@ PKG_TCL_SOURCES = altTheme.tcl button.tc
 		keynav.tcl menubutton.tcl notebook.tcl \
 		scale.tcl scrollbar.tcl stepTheme.tcl tile.tcl \
 		winTheme.tcl xpTheme.tcl clamTheme.tcl fonts.tcl \
-		combobox.tcl
+		combobox.tcl aquaTheme.tcl
 
 #========================================================================
 # This is a list of public header files to be installed, if any.
Index: configure.in
===================================================================
RCS file: /cvsroot/tktable/tile/configure.in,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 configure.in
--- configure.in	11 Jun 2004 23:08:01 -0000	1.8
+++ configure.in	31 Jul 2004 00:46:14 -0000
@@ -40,16 +40,10 @@ TEA_ENABLE_SHARED
 TEA_ENABLE_SYMBOLS
 TEA_CONFIG_CFLAGS
 
-case ${TK_DEFS} in
-    *MAC_OSX_TK*)
-	TK_AQUA=1
-	;;
-esac
-if test x"${TK_AQUA}" = x; then
-    TEA_PATH_X
-else
+TEA_PATH_X
+
+if test "${TEA_WINDOWINGSYSTEM}" = "aqua"; then
     # TkAqua specific settings
-    AC_DEFINE(MAC_OSX_TK)
     TEA_ADD_INCLUDES([-I${TK_TOP_DIR_NATIVE}/macosx])
     TEA_ADD_LIBS([-framework Carbon])
     TEA_ADD_SOURCES([\$(MACOSX_OBJECTS)])
Index: tclconfig/tcl.m4
===================================================================
RCS file: /cvsroot/tktable/tile/tclconfig/tcl.m4,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 tcl.m4
--- tclconfig/tcl.m4	12 Feb 2004 17:54:19 -0000	1.7
+++ tclconfig/tcl.m4	31 Jul 2004 00:46:14 -0000
@@ -2040,7 +2040,18 @@ closedir(d);
 
 AC_DEFUN(TEA_PATH_X, [
     if test "${TEA_PLATFORM}" = "unix" ; then
-	TEA_PATH_UNIX_X
+	case ${TK_DEFS} in
+	    *MAC_OSX_TK*)
+		AC_DEFINE(MAC_OSX_TK)
+		TEA_WINDOWINGSYSTEM="aqua"
+		;;
+	    *)
+		TEA_PATH_UNIX_X
+		TEA_WINDOWINGSYSTEM="x11"
+		;;
+	esac
+    elif test "${TEA_PLATFORM}" = "windows" ; then
+	TEA_WINDOWINGSYSTEM="windows"
     fi
 ])