Don't build the profilers if DISABLE_PROFILER is set.

svn path=/trunk/mono/; revision=112525

diff --git a/mono/profiler/ChangeLog b/mono/profiler/ChangeLog
index 0143ba5943653044d0d4f7cd753314dddaf2f838..30b93f2462be14eb9f5ef4166d5963a2b397c897 100644 (file)
--- a/mono/profiler/ChangeLog
+++ b/mono/profiler/ChangeLog
@@ -1,3 +1,6 @@
+2008-09-08  Massimiliano Mantione <massi@ximian.com>
+       * Makefile.am: Don't build the profilers if DISABLE_PROFILER is set.
+
 2008-09-08  Massimiliano Mantione <massi@ximian.com>
        * mono-profiler-logging.c:
        - setup_user_options: made so that the user has to explicitly request

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 9dc3d9530d4611713119154c60fb68705c4309e3..0b0db4f1a0aa7bc63ff24cc5bf99f6e5b3c679dc 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = \
        -I$(top_srcdir)         \
        $(GLIB_CFLAGS)
 
+if !DISABLE_PROFILER
 if JIT_SUPPORTED
 if PLATFORM_LINUX
 lib_LTLIBRARIES = libmono-profiler-cov.la libmono-profiler-aot.la libmono-profiler-logging.la
@@ -11,6 +12,7 @@ else
 lib_LTLIBRARIES = libmono-profiler-cov.la libmono-profiler-aot.la
 endif
 endif
+endif
 
 if HAVE_OPROFILE
 # Do something that uses OPROFILE_CFLAGS and OPROFILE_LIBS