summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-04-02 21:00:20 +0200
committerBryce Harrington <bryce@osg.samsung.com>2014-09-24 12:20:53 -0700
commitfbb0a260b707cb5f02a14cc368c6f2f0d63564c3 (patch)
treeb5f4d92e6c01623a2d2261c9de25fabc77023b51
parent42320793aa1b3e5a0b74e94a0aadf5d2b9ae5ce2 (diff)
downloadcairo-fbb0a260b707cb5f02a14cc368c6f2f0d63564c3.tar.gz
build-sys: do not try to build util/sphinx on Windows
glib and dlfcn exist on windows, but sphinx code uses a lot of Unix-only API Fixes the following build error on mingw-fedora CC cairo-boilerplate-system.lo ../../../util/cairo-sphinx/sphinx.c:8:22: fatal error: sys/mman.h: No such file or directory compilation terminated. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=63043 Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4e28adfb4..2ce19599e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -805,7 +805,7 @@ CAIRO_ENABLE(symbol_lookup, symbol-lookup, auto, [
PKG_CHECK_MODULES(glib, glib-2.0, have_glib=yes, have_glib=no)
AC_SUBST(glib_CFLAGS)
AC_SUBST(glib_LIBS)
-AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes")
+AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno")
save_LIBS="$LIBS"
AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt")