fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-27 02:20:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[configure] Add option to disable trace.

Browse source 
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
This commit is contained in:
Chris Wilson 2009-09-05 15:21:50 +01:00
parent 9b932d7cd7
commit 310cebf194
7 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boilerplate/Makefile.win32.features
View file

@ -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

1
build/Makefile.win32.features
View file

@ -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

3
build/Makefile.win32.features-h
View file

@ -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

3
build/configure.ac.features
View file

@ -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"

8
configure.ac
View file

@ -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")

7
src/Makefile.win32.features
View file

@ -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

2
util/Makefile.am
View file

@ -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