diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-08-10 01:24:30 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-08-10 01:24:30 +0200 |
| commit | df8f96423429915ef1648310fce8b5aed0917c0a (patch) | |
| tree | 9a68808e362faec89fdf7975ca5e16d002c25c9f /build | |
| parent | 01325ad767acf6213135a0bad895de233324f745 (diff) | |
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.
Diffstat (limited to 'build')
| -rw-r--r-- | build/configure.ac.features | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/configure.ac.features b/build/configure.ac.features index d349a8440..176349e43 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 |