[Mono-devel-list] libgdiplus autotools foo for included cairo change

[Peter Johanson]

Found another small buglet related to the import of cairo sources in
libgdiplus HEAD. If you use the --with-cairo=installed configure switch,
SUBDIRS still includes the libpixman and cairo sources, even though
neither of those has any Makefiles, etc.

small patch attached to fix it.

-pete

-------------- next part --------------
Index: configure.in
===================================================================
--- configure.in	(revision 40101)
+++ configure.in	(working copy)
@@ -30,6 +30,7 @@
 	CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
 	CAIRO_CFLAGS='-I$(top_srcdir)/libpixman/src -I$(top_srcdir)/cairo/src'
 	AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
+	AM_CONDITIONAL(USE_INCLUDED_CAIRO, true)
 else
 	if pkg-config --exact-version 0.3.0 cairo; then
 		echo Cairo installation OK
@@ -39,6 +40,7 @@
 
 	CAIRO_LIBS="`pkg-config --libs cairo`"
 	CAIRO_CFLAGS="`pkg-config --cflags cairo`"
+	AM_CONDITIONAL(USE_INCLUDED_CAIRO, false)
 fi
 
 GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `freetype-config --libs`"
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 40101)
+++ Makefile.am	(working copy)
@@ -1,4 +1,8 @@
+if USE_INCLUDED_CAIRO
 SUBDIRS = libpixman cairo src tests
+else
+SUBDIRS = src tests
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig