From df8f96423429915ef1648310fce8b5aed0917c0a Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 10 Aug 2010 01:24:30 +0200
Subject: build: Fudge the build system some more so it handles extra libs

Add NONPKGCONFIG_EXTRA_LIBS that are only put into the generated pc file
but not used when linking. This is now used to add -lcairo-gobject to
the cairo-gobject.pc file.
---
 build/configure.ac.features | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'build')

diff --git a/build/configure.ac.features b/build/configure.ac.features
index d349a844..176349e4 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -145,6 +145,7 @@ CAIRO_FEATURE_VARS_REGISTER([BASE],[cairo])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([REQUIRES],,[ ])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([CFLAGS NONPKGCONFIG_CFLAGS],,[ ])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([LIBS NONPKGCONFIG_LIBS],,[ ],[$LIBS])dnl
+CAIRO_FEATURE_VARS_REGISTER([NONPKGCONFIG_EXTRA_LIBS])dnl
 AC_SUBST(CAIRO_REQUIRES)dnl
 AC_SUBST(CAIRO_CFLAGS)dnl
 AC_SUBST(CAIRO_LDFLAGS)dnl
@@ -170,6 +171,7 @@ m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE],
 		s%@FEATURE_BASE@%$$1_BASE%g;dnl
 		s%@FEATURE_REQUIRES@%$$1_REQUIRES%g;dnl
 		s%@FEATURE_NONPKGCONFIG_LIBS@%$$1_NONPKGCONFIG_LIBS%g;dnl
+		s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$$1_NONPKGCONFIG_EXTRA_LIBS%g;dnl
 		s%@FEATURE_NONPKGCONFIG_CFLAGS@%$$1_NONPKGCONFIG_CFLAGS%g;dnl
 		" < "$3.tmp" > "$3" && rm -f "$3.tmp" ||
 		AC_MSG_ERROR(failed to update $3)
@@ -178,6 +180,7 @@ m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE],
 		$1_BASE='$$1_BASE'
 		$1_REQUIRES='$$1_REQUIRES'
 		$1_NONPKGCONFIG_LIBS='$$1_NONPKGCONFIG_LIBS'
+		$1_NONPKGCONFIG_EXTRA_LIBS='$$1_NONPKGCONFIG_EXTRA_LIBS'
 		$1_NONPKGCONFIG_CFLAGS='$$1_NONPKGCONFIG_CFLAGS'
 	])dnl
 ])dnl
-- 
cgit v1.2.3