From: John Ellson <john.ellson@comcast.net>
Date: Sun, 4 Dec 2016 19:48:09 +0000 (-0500)
Subject: try are more direct approach to the missing XRENDER_CFLAGS
X-Git-Tag: untagged-f51b8e00e323a78e8270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a96c15964845a8edf5e8d9da39f91d2cbe6ca9e;p=graphviz

try are more direct approach to the missing XRENDER_CFLAGS
---

diff --git a/configure.ac b/configure.ac
index e563ac4c0..6076ceb69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2160,30 +2160,7 @@ fi
 AM_CONDITIONAL(WITH_VISIO, [test "x$use_visio" = "xYes"])
 
 dnl -----------------------------------
-dnl INCLUDES and LIBS for CAIRO
-                                                                                
-AC_ARG_WITH(cairo,
-  [AS_HELP_STRING([--with-cairo=yes],[cairo library])],
-  [], [with_cairo=yes])
-
-if test "x$with_cairo" != "xyes"; then
-  use_cairo="No (disabled)"
-else
-  # require at least the version available on centos5 (fc6 has 1.14.10)
-  PKG_CHECK_MODULES(CAIRO, [cairo >= 1.14.9],[
-    use_cairo="Yes"
-    AC_DEFINE_UNQUOTED(HAVE_CAIRO,1,
-      [Define if you have the cairo library])
-    AC_SUBST([CAIRO_CFLAGS])
-    AC_SUBST([CAIRO_LIBS])
-  ],[
-    use_cairo="No (cairo library not available)"
-  ])
-fi
-AM_CONDITIONAL(WITH_CAIRO, [test "x$use_cairo" = "xYes"])
-
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PANGO
+dnl INCLUDES and LIBS for PANGOCAIRO
                                                                                 
 AC_ARG_WITH(pangocairo,
   [AS_HELP_STRING([--with-pangocairo=yes],[pangocairo library])],
diff --git a/plugin/rsvg/Makefile.am b/plugin/rsvg/Makefile.am
index 510b10504..e7bc1d598 100644
--- a/plugin/rsvg/Makefile.am
+++ b/plugin/rsvg/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/cgraph \
 	-I$(top_srcdir)/lib/cdt \
-	$(RSVG_CFLAGS) $(PANGOCAIRO_CFLAGS) $(CAIRO_CFLAGS)
+	$(RSVG_CFLAGS) $(PANGOCAIRO_CFLAGS) $(XRENDER_CFLAGS)
 
 if WITH_RSVG
 noinst_LTLIBRARIES = libgvplugin_rsvg_C.la
@@ -26,7 +26,8 @@ libgvplugin_rsvg_C_la_SOURCES = \
 libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_rsvg_la_SOURCES = $(libgvplugin_rsvg_C_la_SOURCES)
 libgvplugin_rsvg_la_LIBADD = \
-	$(top_builddir)/lib/gvc/libgvc.la @RSVG_LIBS@ @PANGOCAIRO_LIBS@ @CAIRO_LIBS@
+	$(top_builddir)/lib/gvc/libgvc.la \
+	@RSVG_LIBS@ @PANGOCAIRO_LIBS@ @XRENDER_LIBS@
 
 if WITH_WIN32
 libgvplugin_rsvg_la_LDFLAGS += -no-undefined