about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2013-07-14 02:31:41 +0000
committerEric Wong <normalperson@yhbt.net>2013-07-14 02:32:37 +0000
commit12049de467b52f1c8e4e16b53cb10182d06c6a51 (patch)
tree0c282501e4cdf8b2a75bcdbd0a91785b37a02d55
parent8f9b7e28eaf74e5fdc72328f0dfb890d92c02ec1 (diff)
downloadcmogstored-12049de467b52f1c8e4e16b53cb10182d06c6a51.tar.gz
Only relying on dtrace leads to build problems on FreeBSD which
I haven't had a chance to fix.
-rw-r--r--m4/systemtap.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/systemtap.m4 b/m4/systemtap.m4
index dccb9b3..3c62f08 100644
--- a/m4/systemtap.m4
+++ b/m4/systemtap.m4
@@ -2,8 +2,11 @@ dnl systemtap support
 dnl enable automatically if dtrace and sdt.h are available
 AC_DEFUN([CM_SYSTEMTAP],[
 AC_CHECK_PROGS(DTRACE, dtrace)
+dnl require stap for now, too, as there are compatibility issues with
+dnl dtrace under FreeBSD
+AC_CHECK_PROGS(STAP, stap)
 AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'])
-AS_IF([test "x${DTRACE}" != x && test $SDT_H_FOUND = yes],
+AS_IF([test "x$STAP" != x && test "x$DTRACE" != x && test $SDT_H_FOUND = yes],
         AC_CACHE_CHECK([for sys/sdt.h usability],
                         [cm_cv_sdt_h_usable], [
                         AC_TRY_COMPILE([