Commit 81102cc2 authored by Vasilij Schneidermann's avatar Vasilij Schneidermann Committed by Uli Schlachter

Disable sphinx build if PNG support is disabled

parent 250ae25b
Pipeline #24103 failed with stage
in 4 minutes and 30 seconds
......@@ -828,7 +828,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" -a "x$have_windows" = "xno")
AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno" -a "x$have_png" = "xyes")
Please register or sign in to reply
save_LIBS="$LIBS"
AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt")
......
  • No idea, but it worked this way for me.

  • I've retried it with that suggested change and PNG-free builds still work. Considering that there's far more code in the file with "$use_png" than "$have_png" it looks like the way to go. Shall I create another MR for this or will you apply a patch directly on master instead?

Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment