Index: Makefile.in
===================================================================
diff -u -r50be1d69a0aca30105e72366c0544dec757d7aa8 -rd0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067
--- Makefile.in	(.../Makefile.in)	(revision 50be1d69a0aca30105e72366c0544dec757d7aa8)
+++ Makefile.in	(.../Makefile.in)	(revision d0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067)
@@ -80,9 +80,7 @@
 # are correct.
 #========================================================================
 
-#DTRACE_OBJ = nsfDTrace.o
-#DTRACE_OBJ = @DTRACE_OBJ@
-DTRACE_OBJ = 
+DTRACE_OBJ = @DTRACE_OBJ@
 DTRACE_HDR = $(src_generic_dir)/nsfDTrace.h
 DTRACE_SRC = $(src_generic_dir)/nsfDTrace.d
 
@@ -567,8 +565,8 @@
 $(DTRACE_HDR): $(DTRACE_SRC)
 	$(DTRACE) -h $(DTRACE_SWITCHES) -o $@ -s $(DTRACE_SRC)
 
-#$(DTRACE_OBJ): $(DTRACE_SRC) $(TCL_OBJS)
-#	$(DTRACE) -G $(DTRACE_SWITCHES) -o $@ -s $(DTRACE_SRC) $(TCL_OBJS)
+$(DTRACE_OBJ): $(DTRACE_SRC) $(TCL_OBJS)
+	$(DTRACE) -G $(DTRACE_SWITCHES) -o $@ -s $(DTRACE_SRC) $(TCL_OBJS)
 
 
 #========================================================================
Index: TODO
===================================================================
diff -u -r55683ce78a372bdfd617f65114589460e22a0e64 -rd0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067
--- TODO	(.../TODO)	(revision 55683ce78a372bdfd617f65114589460e22a0e64)
+++ TODO	(.../TODO)	(revision d0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067)
@@ -2408,6 +2408,7 @@
    * add some dtrace sample scripts
    * add dtrace header file dependency
    * add --enable-dtrace flag for configure
+   * --enable-dtrace sets DTRACE_OBJ on mac os x empty (since not needed for mac os x dtrace)
 
 - configure
    * make "configure --help" more pretty
@@ -2419,7 +2420,6 @@
  - handle arguments
  - skip cost of intro
  - object creation
- - setting dtroce.o file on sun/not mac
 
 - serializer: check, why catch is needed for object-level alias 
   (search for ns_cache_flush)
Index: configure
===================================================================
diff -u -r1193731ac6be5de93ad4ab86a90e27f8658875b2 -rd0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067
--- configure	(.../configure)	(revision 1193731ac6be5de93ad4ab86a90e27f8658875b2)
+++ configure	(.../configure)	(revision d0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067)
@@ -648,6 +648,7 @@
 TCL_INCLUDES
 PKG_OBJECTS
 PKG_SOURCES
+DTRACE_OBJ
 aol_prefix
 MATH_LIBS
 EGREP
@@ -5522,10 +5523,15 @@
 
 fi
 
+DTRACE_OBJ=
 if test "$enable_dtrace" = yes; then
 
 $as_echo "#define NSF_DTRACE 1" >>confdefs.h
 
+   # Under Mac OS X, we need no nsfDTrace.o
+   if test "`uname -s`" != "Darwin" ; then
+      DTRACE_OBJ=nsfDTrace.o
+   fi
 fi
 
 
Index: configure.in
===================================================================
diff -u -r1193731ac6be5de93ad4ab86a90e27f8658875b2 -rd0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067
--- configure.in	(.../configure.in)	(revision 1193731ac6be5de93ad4ab86a90e27f8658875b2)
+++ configure.in	(.../configure.in)	(revision d0ddb9df8ff79e52355d0c1d1aa9f4e08ef0e067)
@@ -171,11 +171,16 @@
    AC_DEFINE(NSF_PROFILE, 1, [Are we building with profile support?])
 fi
 
+DTRACE_OBJ=
 if test "$enable_dtrace" = yes; then
    AC_DEFINE(NSF_DTRACE, 1, [Are we building with DTrace support?])
+   # Under Mac OS X, we need no nsfDTrace.o
+   if test "`uname -s`" != "Darwin" ; then
+      DTRACE_OBJ=nsfDTrace.o
+   fi
 fi
+AC_SUBST(DTRACE_OBJ)
 
-
 #-----------------------------------------------------------------------
 # __CHANGE__
 # Specify the C source files to compile in TEA_ADD_SOURCES,