From 310cebf194919cf3a7c37e724e64962ae47343cc Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 5 Sep 2009 15:21:50 +0100
Subject: [PATCH] [configure] Add option to disable trace.

Some environments may be broken beyond our capabilities to detect, or
maybe the user is just insane and doesn't want to build my nice shiny
cairo-trace. Whatever, give them the option to choose:

  $ ./configure --disable-trace
---
 boilerplate/Makefile.win32.features | 7 +++++++
 build/Makefile.win32.features       | 1 +
 build/Makefile.win32.features-h     | 3 +++
 build/configure.ac.features         | 3 +++
 configure.ac                        | 8 +++++---
 src/Makefile.win32.features         | 7 +++++++
 util/Makefile.am                    | 2 +-
 7 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features
index 03eee6e5a..498d0beb1 100644
--- a/boilerplate/Makefile.win32.features
+++ b/boilerplate/Makefile.win32.features
@@ -347,3 +347,10 @@ all_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
+
+all_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
+ifeq ($(CAIRO_HAS_TRACE),1)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
+endif
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features
index bc82d0ff9..eb10b236b 100644
--- a/build/Makefile.win32.features
+++ b/build/Makefile.win32.features
@@ -30,3 +30,4 @@ CAIRO_HAS_PDF_SURFACE=1
 CAIRO_HAS_SVG_SURFACE=1
 CAIRO_HAS_TEST_SURFACES=0
 CAIRO_HAS_XML_SURFACE=1
+CAIRO_HAS_TRACE=1
diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h
index 4eb593261..552a2d0aa 100644
--- a/build/Makefile.win32.features-h
+++ b/build/Makefile.win32.features-h
@@ -99,4 +99,7 @@ ifeq ($(CAIRO_HAS_XML_SURFACE),1)
 	@echo "#define CAIRO_HAS_XML_SURFACE 1" >> src/cairo-features.h
 endif
 	@echo "#define CAIRO_HAS_USER_FONT 1" >> src/cairo-features.h
+ifeq ($(CAIRO_HAS_TRACE),1)
+	@echo "#define CAIRO_HAS_TRACE 1" >> src/cairo-features.h
+endif
 	@echo "#endif" >>  src/cairo-features.h
diff --git a/build/configure.ac.features b/build/configure.ac.features
index ec9cde549..2606850b6 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -393,6 +393,9 @@ AC_DEFUN([CAIRO_REPORT],
 	echo "  EGL functions:   $use_egl"
 	echo "  Eagle functions: $use_eagle"
 	echo ""
+	echo "The following features and utilies:"
+	echo "  cairo-trace:   $use_trace"
+	echo ""
 	echo "And the following internal features:"
 	echo "  gtk-doc:       $enable_gtk_doc"
 	echo "  gcov support:  $use_gcov"
diff --git a/configure.ac b/configure.ac
index d1b105ef4..c4b38d89a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,9 +644,11 @@ case $host in
 	;;
 esac
 
-AM_CONDITIONAL(BUILD_TRACE,
-	       test "x$have_ld_preload" = "xyes" \
-	       -a "x$have_libz" = "xyes")
+CAIRO_ENABLE(trace, cairo-trace, yes, [
+	if test "x$have_ld_preload" != "xyes" -o "x$have_libz" != "xyes"; then
+		use_trace="no (requires dynamic linker and zlib)"
+	fi
+])
 
 AM_CONDITIONAL(BUILD_SCRIPT, test "x$have_libz" = "xyes")
 
diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features
index df8384d97..516409608 100644
--- a/src/Makefile.win32.features
+++ b/src/Makefile.win32.features
@@ -465,3 +465,10 @@ all_cairo_sources += $(cairo_user_sources)
 enabled_cairo_headers += $(cairo_user_headers)
 enabled_cairo_private += $(cairo_user_private)
 enabled_cairo_sources += $(cairo_user_sources)
+
+all_cairo_private += $(cairo_trace_private) $(cairo_trace_headers)
+all_cairo_sources += $(cairo_trace_sources)
+ifeq ($(CAIRO_HAS_TRACE),1)
+enabled_cairo_private += $(cairo_trace_private) $(cairo_trace_headers)
+enabled_cairo_sources += $(cairo_trace_sources)
+endif
diff --git a/util/Makefile.am b/util/Makefile.am
index fb471627c..6ee0ba935 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -6,7 +6,7 @@ if BUILD_SCRIPT
 SUBDIRS += cairo-script
 endif
 
-if BUILD_TRACE
+if CAIRO_HAS_TRACE
 SUBDIRS += cairo-trace
 if CAIRO_HAS_SCRIPT_SURFACE
 SUBDIRS += cairo-fdr