X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config%2Fdtrace.m4;h=ee39c69a271a48ae0613d1ffb3ee8f16f1072707;hb=7582050eb5e2bdc7e055c84d639a7cb5b407cd4c;hp=af27ed49d7e54f140b0730ceb90d9f3685c0ab98;hpb=eaf02380bad52c3c5dacdfd81b73e95a44ad68b1;p=awesomized%2Flibmemcached

diff --git a/config/dtrace.m4 b/config/dtrace.m4
index af27ed49..ee39c69a 100644
--- a/config/dtrace.m4
+++ b/config/dtrace.m4
@@ -4,16 +4,33 @@ dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(dtrace,
     [  --enable-dtrace      Build with support for the DTRACE.],
     [ 
+    AC_PATH_PROG([DTRACE], [dtrace], "no", [/usr/sbin:$PATH])
+    if test "x$DTRACE" != "xno"; then
       AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support])
-      AC_CHECK_PROGS(DTRACE, dtrace)
-      ENABLE_DTRACE="yes" 
-      AC_SUBST(DTRACEFLAGS)
+      DTRACE_HEADER=dtrace_probes.h
+
+      # DTrace on MacOSX does not use -G option
+      $DTRACE -G -o conftest.$$ -s libmemcached/libmemcached_probes.d 2>/dev/zero
+      if test $? -eq 0
+      then
+        DTRACE_OBJ=libmemcached_probes.lo
+        rm conftest.$$
+      fi
+
+      ENABLE_DTRACE="yes"
       AC_SUBST(HAVE_DTRACE)
+    else
+      AC_MSG_ERROR([Need dtrace binary and OS support.])
+    fi
     ],
     [
       ENABLE_DTRACE="no" 
     ]
     )
+
+AC_SUBST(DTRACEFLAGS)
+AC_SUBST(DTRACE_HEADER)
+AC_SUBST(DTRACE_OBJ)
 AM_CONDITIONAL([HAVE_DTRACE], [ test "$ENABLE_DTRACE" = "yes" ])
 dnl ---------------------------------------------------------------------------
 dnl End Macro: DTRACE_TEST