Browse files

fix make distcheck for the default (internal cairo) config

svn path=/trunk/libgdiplus/; revision=83756
  • Loading branch information...
1 parent 03fb41b commit 024a1591a37f1e0c94399b3e852af27e3ff396cc Sebastien Pouliot committed Aug 9, 2007
Showing with 3 additions and 2 deletions.
  1. +1 −1 Makefile.am
  2. +2 −1 configure.in
View
2 Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = $(CAIRO_DIR) src tests
+SUBDIRS = @CAIRO_DIR@ src tests
pkgconfigdir = $(libdir)/pkgconfig
View
3 configure.in
@@ -33,7 +33,7 @@ if test $cairo_v = "internal"; then
ac_configure_args="$ac_configure_args --disable-pdf --disable-svg"
AC_CONFIG_SUBDIRS(cairo)
- CAIRO_DIR='cairo'
+ CAIRO_DIR="cairo"
CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
@@ -356,6 +356,7 @@ AC_SUBST(GDIPLUS_CFLAGS)
AC_SUBST(GDIPLUS_PKG_LIBS)
AC_SUBST(GDIPLUS_PKG_CFLAGS)
AC_SUBST(GDIPLUS_PKG_REQ)
+AC_SUBST(CAIRO_DIR)
AC_OUTPUT([
Makefile

0 comments on commit 024a159

Please sign in to comment.