diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N -x tcl.m4 orig/snack2.2.9/unix/Makefile.in snack/unix/Makefile.in
--- orig/snack2.2.9/unix/Makefile.in	Thu Dec  2 01:23:47 2004
+++ snack/unix/Makefile.in	Thu May  5 01:50:41 2005
@@ -31,7 +31,7 @@ CC        = @CC@
 
 INCLUDES  = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
 
-CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
+override CFLAGS := -O @CFLAGS@ $(CFLAGS) @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
 
 LIBSO     = -lc @ALIB@ @TCL_LIB_SPEC@
 
@@ -167,6 +167,7 @@ libsnack${SHLIB_SUFFIX}: ${OBJSN}
 
 stublib: ${OBJSNST}
 	ar cr libsnackstub${VERSION}.a ${OBJSNST}
+	ranlib libsnackstub${VERSION}.a
 
 editversion: ${OBJSN}
 	if test "$(TCL_VERSION)" != "8.4"; then\
diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N -x tcl.m4 orig/snack2.2.9/unix/configure.in snack/unix/configure.in
--- orig/snack2.2.9/unix/configure.in	Thu Dec  2 01:23:47 2004
+++ snack/unix/configure.in	Sat Jun  4 17:52:29 2005
@@ -128,12 +128,13 @@ case $system in
 	AFLAG="-DSolaris"
 	AOBJ="jkAudIO_sun.o"
 	;;
-    Rhapsody-*|Darwin-*)
+    Darwin-*)
 	HACK=""
 	AFLAG="-DOS_X_CORE_AUDIO -DMA${HACK}C_OSX_TCL -DMA${HACK}C_OSX_TK"
 	ALIB="-framework CoreFoundation -framework CoreAudio"
 	AOBJ="jkAudIO_osx.o"
-	CFLAGS="-Os -fno-common"
+	CFLAGS="-Os ${CFLAGS}"
+	XINCLUDES="-I${TK_SRC_DIR}/xlib"
         ;;
     *)
 	AFLAG="-DOTHER"