From 6bd5ce080291576337567fdcc6c2bc1407961ee0 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 2 Jan 2018 15:53:10 +0000
Subject: [PATCH 09/17] macOS: include <cairo.h> not <cairo/xlib.h>

---
 configure   | 11 +++++------
 m4/cairo.m4 | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 0d441763bb..7ab3b9dafd 100755
--- a/configure
+++ b/configure
@@ -37870,8 +37870,8 @@ $as_echo "$r_cv_has_pangocairo" >&6; }
        modlist="${modlist} cairo-svg"
        r_cairo_svg=yes
     fi
-      if "${PKGCONF}" --exists cairo-xlib; then
-         xmodlist="${modlist} cairo-xlib"
+      if "${PKGCONF}" --exists cairo; then
+         xmodlist="${modlist} cairo"
       else
          xmodlist="${modlist}"
       fi
@@ -37893,7 +37893,7 @@ else
 
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
-#include <cairo-xlib.h>
+#include <cairo.h>
 #if CAIRO_VERSION  < 10200
 #error cairo version >= 1.2 required
 #endif
@@ -37957,8 +37957,8 @@ $as_echo "$r_cv_has_cairo" >&6; }
          modlist="${modlist} cairo-svg"
          r_cairo_svg=yes
       fi
-      if "${PKGCONF}" --exists cairo-xlib; then
-         xmodlist="${modlist} cairo-xlib"
+      if "${PKGCONF}" --exists cairo; then
+         xmodlist="${modlist} cairo"
       else
          xmodlist="${modlist}"
       fi
@@ -37989,7 +37989,6 @@ else
 /* end confdefs.h.  */
 
 #include <cairo.h>
-#include <cairo-xlib.h>
 #if CAIRO_VERSION  < 10200
 #error cairo version >= 1.2 required
 #endif
diff --git a/m4/cairo.m4 b/m4/cairo.m4
index 4e7df87365..893321dd6c 100644
--- a/m4/cairo.m4
+++ b/m4/cairo.m4
@@ -52,8 +52,8 @@ else
        modlist="${modlist} cairo-svg"
        r_cairo_svg=yes
     fi
-      if "${PKGCONF}" --exists cairo-xlib; then
-         xmodlist="${modlist} cairo-xlib"
+      if "${PKGCONF}" --exists cairo; then
+         xmodlist="${modlist} cairo"
       else
          xmodlist="${modlist}"
       fi
@@ -70,7 +70,7 @@ else
                     [AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
-#include <cairo-xlib.h>
+#include <cairo.h>
 #if CAIRO_VERSION  < 10200
 #error cairo version >= 1.2 required
 #endif
@@ -116,8 +116,8 @@ int main(void) {
          modlist="${modlist} cairo-svg"
          r_cairo_svg=yes
       fi
-      if "${PKGCONF}" --exists cairo-xlib; then
-         xmodlist="${modlist} cairo-xlib"
+      if "${PKGCONF}" --exists cairo; then
+         xmodlist="${modlist} cairo"
       else
          xmodlist="${modlist}"
       fi
@@ -143,7 +143,6 @@ int main(void) {
 		     [r_cv_cairo_works], 
                      [AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <cairo.h>
-#include <cairo-xlib.h>
 #if CAIRO_VERSION  < 10200
 #error cairo version >= 1.2 required
 #endif
-- 
2.18.0

