Permalink
Browse files

2009-01-27 Sebastien Pouliot <sebastien@ximian.com>

	* configure.in: Always include (and build) the internal cairo and 
	pixman libraries even if, at the end, we're not linking against 
	them. Not a perfect solution but that fix #467759


svn path=/branches/mono-2-4/libgdiplus/; revision=124742
  • Loading branch information...
1 parent dccd62a commit 7420a13ff17cf90ef504ea6396156549e508a218 Sebastien Pouliot committed Jan 28, 2009
Showing with 8 additions and 3 deletions.
  1. +6 −0 ChangeLog
  2. +2 −3 configure.in
View
@@ -1,3 +1,9 @@
+2009-01-27 Sebastien Pouliot <sebastien@ximian.com>
+
+ * configure.in: Always include (and build) the internal cairo and
+ pixman libraries even if, at the end, we're not linking against
+ them. Not a perfect solution but that fix #467759
+
2009-01-02 Sebastien Pouliot <sebastien@ximian.com>
* autogen.sh: Rename --with-cairo=system to --skip-cairo. This option
View
@@ -38,8 +38,6 @@ if test $cairo_v = "internal"; then
# of the internal build
ac_configure_args="$ac_configure_args --disable-quartz-font"
- AC_CONFIG_SUBDIRS([pixman cairo])
- CAIRO_DIR="pixman cairo"
CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
CAIRO_CFLAGS='-I$(top_builddir)/pixman/pixman -I$(top_srcdir)/pixman/pixman -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
cairo_info+="$CAIRO_BUNDLED_VERSION (internal)"
@@ -49,7 +47,6 @@ if test $cairo_v = "internal"; then
AC_MSG_ERROR("Pango text rendering is only possible with --with-cairo=system")
fi
else
- CAIRO_DIR=""
CAIRO_LIBS="`pkg-config --libs cairo `"
CAIRO_CFLAGS="`pkg-config --cflags cairo `"
cairo_info="`pkg-config --modversion cairo ` (system)"
@@ -65,6 +62,8 @@ else
fi
fi
+AC_CONFIG_SUBDIRS([pixman cairo])
+CAIRO_DIR="pixman cairo"
GDIPLUS_LIBS="$GDIPLUS_LIBS $CAIRO_LIBS $PANGO_LIBS"
GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS $CAIRO_CFLAGS $PANGO_CFLAGS"

0 comments on commit 7420a13

Please sign in to comment.