From af4bd9720d5fbdfaeac0b2ccf6d78a242416afe8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 25 Jan 2016 18:29:53 -0500 Subject: [PATCH] * configure.ac (USE_CAIRO): Rename to more standard HAVE_CAIRO. --- configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 1f72433152a..fad556f7992 100644 --- a/configure.ac +++ b/configure.ac @@ -3141,13 +3141,13 @@ AC_SUBST(LIBOTF_LIBS) AC_SUBST(M17N_FLT_CFLAGS) AC_SUBST(M17N_FLT_LIBS) -USE_CAIRO=no +HAVE_CAIRO=no if test "${HAVE_X11}" = "yes"; then if test "${with_cairo}" != "no"; then CAIRO_REQUIRED=1.12.0 CAIRO_MODULE="cairo >= $CAIRO_REQUIRED" - EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE, USE_CAIRO=yes, :) - if test $USE_CAIRO = 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.]) else AC_MSG_ERROR([cairo requested but not found.]) @@ -4920,7 +4920,7 @@ if test "${HAVE_X_WINDOWS}" = "yes" ; then XMENU_OBJ=xmenu.o XOBJ="xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o" FONT_OBJ=xfont.o - if test "$USE_CAIRO" = "yes"; then + if test "$HAVE_CAIRO" = "yes"; then FONT_OBJ="ftfont.o ftcrfont.o" elif test "$HAVE_XFT" = "yes"; then FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" @@ -5268,7 +5268,7 @@ for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \ case $opt in NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;; - CAIRO|TOOLKIT_SCROLL_BARS|X_TOOLKIT) eval val=\${USE_$opt} ;; + TOOLKIT_SCROLL_BARS|X_TOOLKIT) eval val=\${USE_$opt} ;; *) eval val=\${HAVE_$opt} ;; esac case x$val in @@ -5295,7 +5295,7 @@ AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF Does Emacs use a png library? ${HAVE_PNG} $LIBPNG Does Emacs use -lrsvg-2? ${HAVE_RSVG} - Does Emacs use cairo? ${USE_CAIRO} + Does Emacs use cairo? ${HAVE_CAIRO} Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK} Does Emacs support sound? ${HAVE_SOUND} Does Emacs use -lgpm? ${HAVE_GPM} -- 2.11.4.GIT