From 93edaf130f4d1bb5772d5080535a71f8bc409bd7 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 14 Jun 2010 08:42:15 -0700
Subject: [PATCH] Fixed dtrace building.

---
 libmemcached/include.am     | 10 ++++++----
 m4/pandora_enable_dtrace.m4 |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 84701271..024d32dc 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -150,10 +150,11 @@ endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h
-libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
+CLEANFILES+= libmemcached/dtrace_probes.h
 endif
 
 if DTRACE_NEEDS_OBJECTS
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
 endif
 
@@ -162,7 +163,8 @@ SUFFIXES+= .d
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
 	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s libmemcached/libmemcached_probes.d
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d $(libmemcached_libmemcached_la_OBJECTS)
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/.libs/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d  config.h
+
+.d.o:
+	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' libmemcached/*.lo | cut -f 2 -d\' | sed 's/^/libmemcached\//'`
 
diff --git a/m4/pandora_enable_dtrace.m4 b/m4/pandora_enable_dtrace.m4
index 1e034a02..627fd3d0 100644
--- a/m4/pandora_enable_dtrace.m4
+++ b/m4/pandora_enable_dtrace.m4
@@ -11,7 +11,7 @@ AC_DEFUN([PANDORA_ENABLE_DTRACE],[
     [AS_HELP_STRING([--disable-dtrace],
             [Build with support for the DTRACE. @<:@default=on@:>@])],
     [ac_cv_enable_dtrace="$enableval"],
-    [ac_cv_enable_dtrace="no"])
+    [ac_cv_enable_dtrace="yes"])
 
   AS_IF([test "$ac_cv_enable_dtrace" = "yes"],[
     AC_CHECK_PROGS([DTRACE], [dtrace])
-- 
2.30.2