[cairo-commit] 2 commits - configure.ac

[GitLab Mirror]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d909a7392c0b8261e5c9b21a25742601931a5eef
Merge: f5d32c071 f271715f3
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Jan 19 16:34:49 2021 +0000

    Merge branch 'use_correct_variable' into 'master'
    
    Replace $have_png with $use_png
    
    See merge request cairo/cairo!88

commit f271715f374083ebccc6d6b93fcef6c000d440b3
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Dec 19 11:24:46 2020 +0100

    Replace $have_png with $use_png
    
    The remaining code in configure.ac also uses this variable.
    
    Reported-at: https://gitlab.freedesktop.org/cairo/cairo/commit/81102cc214814cac8c99fed08a877d8f38312e51#note_201221
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/configure.ac b/configure.ac
index 8d23ae0c1..dd59196b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -839,7 +839,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" -a "x$have_png" = "xyes")
+AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno" -a "x$use_png" = "xyes")
 
 save_LIBS="$LIBS"
 AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt")