Skip to content

Commit 7a96c15

Browse files
committed
try are more direct approach to the missing XRENDER_CFLAGS
1 parent 806b8a2 commit 7a96c15

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

configure.ac

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,30 +2160,7 @@ fi
21602160
AM_CONDITIONAL(WITH_VISIO, [test "x$use_visio" = "xYes"])
21612161

21622162
dnl -----------------------------------
2163-
dnl INCLUDES and LIBS for CAIRO
2164-
2165-
AC_ARG_WITH(cairo,
2166-
[AS_HELP_STRING([--with-cairo=yes],[cairo library])],
2167-
[], [with_cairo=yes])
2168-
2169-
if test "x$with_cairo" != "xyes"; then
2170-
use_cairo="No (disabled)"
2171-
else
2172-
# require at least the version available on centos5 (fc6 has 1.14.10)
2173-
PKG_CHECK_MODULES(CAIRO, [cairo >= 1.14.9],[
2174-
use_cairo="Yes"
2175-
AC_DEFINE_UNQUOTED(HAVE_CAIRO,1,
2176-
[Define if you have the cairo library])
2177-
AC_SUBST([CAIRO_CFLAGS])
2178-
AC_SUBST([CAIRO_LIBS])
2179-
],[
2180-
use_cairo="No (cairo library not available)"
2181-
])
2182-
fi
2183-
AM_CONDITIONAL(WITH_CAIRO, [test "x$use_cairo" = "xYes"])
2184-
2185-
dnl -----------------------------------
2186-
dnl INCLUDES and LIBS for PANGO
2163+
dnl INCLUDES and LIBS for PANGOCAIRO
21872164

21882165
AC_ARG_WITH(pangocairo,
21892166
[AS_HELP_STRING([--with-pangocairo=yes],[pangocairo library])],

plugin/rsvg/Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
88
-I$(top_srcdir)/lib/gvc \
99
-I$(top_srcdir)/lib/cgraph \
1010
-I$(top_srcdir)/lib/cdt \
11-
$(RSVG_CFLAGS) $(PANGOCAIRO_CFLAGS) $(CAIRO_CFLAGS)
11+
$(RSVG_CFLAGS) $(PANGOCAIRO_CFLAGS) $(XRENDER_CFLAGS)
1212

1313
if WITH_RSVG
1414
noinst_LTLIBRARIES = libgvplugin_rsvg_C.la
@@ -26,7 +26,8 @@ libgvplugin_rsvg_C_la_SOURCES = \
2626
libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
2727
libgvplugin_rsvg_la_SOURCES = $(libgvplugin_rsvg_C_la_SOURCES)
2828
libgvplugin_rsvg_la_LIBADD = \
29-
$(top_builddir)/lib/gvc/libgvc.la @RSVG_LIBS@ @PANGOCAIRO_LIBS@ @CAIRO_LIBS@
29+
$(top_builddir)/lib/gvc/libgvc.la \
30+
@RSVG_LIBS@ @PANGOCAIRO_LIBS@ @XRENDER_LIBS@
3031

3132
if WITH_WIN32
3233
libgvplugin_rsvg_la_LDFLAGS += -no-undefined

0 commit comments

Comments
 (0)