From 88efc736f562656efab778d35c32d549ef6270d7 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Tue, 14 Jan 2020 11:18:20 +0100 Subject: [PATCH] Default cairo to enabled * configure.ac (USE_CAIRO): Default cairo to enabled. * etc/NEWS: Announce the change to use cairo if found. --- configure.ac | 13 ++++++------- etc/NEWS | 4 ++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index f040b748d0a..592d745797c 100644 --- a/configure.ac +++ b/configure.ac @@ -430,7 +430,7 @@ OPTION_DEFAULT_ON([png],[don't compile with PNG image support]) OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support]) OPTION_DEFAULT_ON([lcms2],[don't compile with Little CMS support]) OPTION_DEFAULT_ON([libsystemd],[don't compile with libsystemd support]) -OPTION_DEFAULT_OFF([cairo],[compile with Cairo drawing]) +OPTION_DEFAULT_ON([cairo],[don't compile with Cairo drawing]) OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support]) OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support]) OPTION_DEFAULT_ON([json], [don't compile with native JSON support]) @@ -3300,14 +3300,13 @@ if test "${HAVE_X11}" = "yes"; then EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE) if test $HAVE_CAIRO = yes; then AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.]) + CFLAGS="$CFLAGS $CAIRO_CFLAGS" + LIBS="$LIBS $CAIRO_LIBS" + AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(CAIRO_LIBS) else - AC_MSG_ERROR([cairo requested but not found.]) + AC_MSG_WARN([cairo requested but not found.]) fi - - CFLAGS="$CFLAGS $CAIRO_CFLAGS" - LIBS="$LIBS $CAIRO_LIBS" - AC_SUBST(CAIRO_CFLAGS) - AC_SUBST(CAIRO_LIBS) fi fi diff --git a/etc/NEWS b/etc/NEWS index b87202014d2..d5a1d27267a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -24,6 +24,10 @@ applies, and please also update docstrings as needed. * Installation Changes in Emacs 28.1 +** Cairo is now used by default if found. +'--with-cairo' is now the default, if the appropriate development files +are found by 'configure' + * Startup Changes in Emacs 28.1