diff options
| author | Trond Norbye <Trond.Norbye@sun.com> | 2009-03-04 16:36:08 +0100 |
|---|---|---|
| committer | Dustin Sallings <dustin@spy.net> | 2009-03-04 13:49:43 -0800 |
| commit | 7c23e79f975e52a348937cf7ad7e238cc72aa1da (patch) | |
| tree | 69d5b6d9b3c76b8b1402a8bc57332367f94a2215 /configure.ac | |
| parent | bdd7b8b2acbc07092d957e20ec7292a0335e0312 (diff) | |
| download | memcached-7c23e79f975e52a348937cf7ad7e238cc72aa1da.tar.gz | |
Modified the dtrace build support
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 1e1c495..9c9991a 100644 --- a/configure.ac +++ b/configure.ac @@ -44,25 +44,23 @@ if test "x$enable_dtrace" == "xyes"; then AC_PATH_PROG([DTRACE], [dtrace], "no", [/usr/sbin:$PATH]) if test "x$DTRACE" != "xno"; then AC_DEFINE([ENABLE_DTRACE],1,[Set to nonzero if you want to include DTRACE]) - DTRACE_HEADER=memcached_dtrace.h - + build_dtrace=yes # DTrace on MacOSX does not use -G option $DTRACE -G -o conftest.$$ -s memcached_dtrace.d 2>/dev/zero if test $? -eq 0 then - DTRACE_OBJ=memcached_dtrace.o - DTRACE_DEBUG_OBJ=memcached_debug_dtrace.o + dtrace_instrument_obj=yes rm conftest.$$ - fi + fi else AC_MSG_ERROR([Need dtrace binary and OS support.]) fi fi +AM_CONDITIONAL([BUILD_DTRACE],[test "$build_dtrace" = "yes"]) +AM_CONDITIONAL([DTRACE_INSTRUMENT_OBJ],[test "$dtrace_instrument_obj" = "yes"]) + AC_SUBST(DTRACE) -AC_SUBST(DTRACE_HEADER) -AC_SUBST(DTRACE_OBJ) -AC_SUBST(DTRACE_DEBUG_OBJ) AC_SUBST(DTRACEFLAGS) AC_SUBST(PROFILER_LDFLAGS) |