diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-08-22 22:20:35 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-08-29 17:07:37 +0100 |
| commit | 7447915381fc64bd0c66f7110c1dd0b8a10d73f5 (patch) | |
| tree | 68dd313708484605acf0ae890f41964a7ae30388 | |
| parent | fcda9fc2f29c2ee7d0bb45c17a2261badfdf430c (diff) | |
[script] Conditionalise the build
Allow the interpreter to be disabled if we can not satisfy its dependencies.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | util/Makefile.am | 11 | ||||
| -rw-r--r-- | util/cairo-script/Makefile.am | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b726cd427..fbc15763e 100644 --- a/configure.ac +++ b/configure.ac @@ -641,6 +641,8 @@ AM_CONDITIONAL(BUILD_TRACE, test "x$have_ld_preload" = "xyes" \ -a "x$have_libz" = "xyes") +AM_CONDITIONAL(BUILD_SCRIPT, test "x$have_libz" = "xyes") + AC_CHECK_LIB(bfd, bfd_openr, [AC_CHECK_HEADER(bfd.h, [have_bfd=yes], [have_bfd=no])], [have_bfd=no]) diff --git a/util/Makefile.am b/util/Makefile.am index 5c110ab2c..fb471627c 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,10 @@ include $(top_srcdir)/build/Makefile.am.common -SUBDIRS = . cairo-script +SUBDIRS = . + +if BUILD_SCRIPT +SUBDIRS += cairo-script +endif if BUILD_TRACE SUBDIRS += cairo-trace @@ -20,7 +24,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/util/cairo-script \ $(CAIRO_CFLAGS) -EXTRA_PROGRAMS += show-traps show-edges show-events trace-to-xml xml-to-trace +EXTRA_PROGRAMS += show-traps show-edges show-events +if BUILD_SCRIPT +EXTRA_PROGRAMS += trace-to-xml xml-to-trace +endif trace_to_xml_LDADD = cairo-script/libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LDADD) diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am index 8b783a9ad..d7e44274f 100644 --- a/util/cairo-script/Makefile.am +++ b/util/cairo-script/Makefile.am @@ -19,7 +19,7 @@ libcairo_script_interpreter_la_SOURCES = \ $(NULL) libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS) libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) +libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) -lz csi_replay_SOURCES = csi-replay.c csi_replay_CFLAGS = $(CAIRO_CFLAGS) |