summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Bosmans <mkbosmans@gmail.com>2012-04-09 21:33:50 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2012-04-10 12:07:49 +0100
commit9fcbe25c2dcf831783bb0fd20af9754c0b5c409b (patch)
treeb57fc4a6041739b06d11a472b944015a5530a4db
parent3f32419257bb2e380dd63a3b1a850b512a617776 (diff)
Protect code using dlfcn.h with CAIRO_HAS_DLSYM
-rw-r--r--configure.ac1
-rw-r--r--util/Makefile.am4
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index cedfebe4..5d2e6ece 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes")
if test "x$have_dlsym" = "xyes"; then
AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available])
fi
+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes")
dnl ===========================================================================
diff --git a/util/Makefile.am b/util/Makefile.am
index f202f350..82d0a804 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -12,20 +12,24 @@ endif
if CAIRO_HAS_TRACE
SUBDIRS += cairo-trace
+if CAIRO_HAS_DLSYM
if CAIRO_HAS_SCRIPT_SURFACE
if CAIRO_HAS_TEE_SURFACE
SUBDIRS += cairo-fdr
endif
endif
endif
+endif
if BUILD_SPHINX
+if CAIRO_HAS_DLSYM
if CAIRO_HAS_SCRIPT_SURFACE
if CAIRO_HAS_TEE_SURFACE
SUBDIRS += cairo-sphinx
endif
endif
endif
+endif
AM_CPPFLAGS = -I$(top_srcdir)/src \
-I$(top_builddir)/src \