[packages/cairo.git] / cairo-gobject-deps.patch

Hack to avoid leaking cairo-gobject dependencies to main cairo.pc
--- cairo-1.14.0/build/aclocal.enable.m4.orig	2014-10-18 14:18:01.248879262 +0200
+++ cairo-1.14.0/build/aclocal.enable.m4	2014-10-18 14:18:52.212210456 +0200
@@ -101,10 +101,12 @@ AC_DEFUN([_CAIRO_ENABLE],
 
 	AS_IF([test "x$use_$1" = "xyes"],
 	[dnl
+		AS_IF([test "cr_feature" != "gobject"],[dnl
 		CAIRO_ACCUMULATED_FEATURE_VARS_FOREACH([cr_var],
 		[dnl
 			CAIRO_ACCUMULATE_UNQUOTED_BEFORE(cr_var, [$]cr_feature[_]cr_var)
 		])dnl
+		])dnl
 	],[dnl
 		dnl If not enabled, empty the vars so no one accidentally uses them.
 		CAIRO_FEATURE_VARS_FOREACH([cr_var], [unset cr_feature[_]cr_var]m4_newline)
Commit	Line	Data
eca05c24 JB	1	Hack to avoid leaking cairo-gobject dependencies to main cairo.pc
	2	--- cairo-1.14.0/build/aclocal.enable.m4.orig 2014-10-18 14:18:01.248879262 +0200
	3	+++ cairo-1.14.0/build/aclocal.enable.m4 2014-10-18 14:18:52.212210456 +0200
	4	@@ -101,10 +101,12 @@ AC_DEFUN([_CAIRO_ENABLE],
	5
	6	AS_IF([test "x$use_$1" = "xyes"],
	7	[dnl
	8	+ AS_IF([test "cr_feature" != "gobject"],[dnl
	9	CAIRO_ACCUMULATED_FEATURE_VARS_FOREACH([cr_var],
	10	[dnl
	11	CAIRO_ACCUMULATE_UNQUOTED_BEFORE(cr_var, [$]cr_feature[_]cr_var)
	12	])dnl
	13	+ ])dnl
	14	],[dnl
	15	dnl If not enabled, empty the vars so no one accidentally uses them.
	16	CAIRO_FEATURE_VARS_FOREACH([cr_var], [unset cr_feature[_]cr_var]m4_newline)