Index: Makefile.in =================================================================== RCS file: /cvsroot/tktable/tile/Makefile.in,v retrieving revision 1.17 diff -u -p -u -p -r1.17 Makefile.in --- Makefile.in 28 Apr 2004 14:16:53 -0000 1.17 +++ Makefile.in 11 May 2004 00:40:42 -0000 @@ -31,6 +31,7 @@ GENERIC_OBJECTS = \ clamTheme.$(OBJEXT) WIN_OBJECTS = winTheme.$(OBJEXT) xpTheme.$(OBJEXT) monitor.$(OBJEXT) +MACOSX_OBJECTS = aquaTheme.$(OBJEXT) PKG_OBJECTS = $(GENERIC_OBJECTS) @PKG_OBJECTS@ @@ -43,7 +44,7 @@ PKG_OBJECTS = $(GENERIC_OBJECTS) @PKG_OB PKG_TCL_SOURCES = altTheme.tcl button.tcl \ defaults.tcl keynav.tcl menubutton.tcl notebook.tcl \ scale.tcl scrollbar.tcl stepTheme.tcl tile.tcl \ - winTheme.tcl xpTheme.tcl clamTheme.tcl + winTheme.tcl xpTheme.tcl clamTheme.tcl aquaTheme.tcl #======================================================================== # This is a list of public header files to be installed, if any. @@ -166,7 +167,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(C # for the BINARIES that you specified above have already been done. #======================================================================== -VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win +VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx all: binaries libraries doc Index: configure.in =================================================================== RCS file: /cvsroot/tktable/tile/configure.in,v retrieving revision 1.7 diff -u -p -u -p -r1.7 configure.in --- configure.in 28 Mar 2004 02:56:18 -0000 1.7 +++ configure.in 11 May 2004 00:40:43 -0000 @@ -40,7 +40,20 @@ TEA_ENABLE_SHARED TEA_ENABLE_SYMBOLS TEA_CONFIG_CFLAGS -TEA_PATH_X +case ${TK_DEFS} in + *MAC_OSX_TK*) + TK_AQUA=1 + ;; +esac +if test x"${TK_AQUA}" = x; then + TEA_PATH_X +else + # 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)]) +fi AC_DEFINE(USE_TCL_STUBS) AC_DEFINE(USE_TK_STUBS)