diff options
| -rw-r--r-- | build/configure.ac.features | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/cairo-features-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | src/cairo-features.pc.in | 2 |
4 files changed, 6 insertions, 3 deletions
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 diff --git a/configure.ac b/configure.ac index 1ca41129..ce5afc19 100644 --- a/configure.ac +++ b/configure.ac @@ -658,7 +658,7 @@ CAIRO_ENABLE_FUNCTIONS(gobject, gobject, auto, [ gobject_REQUIRES="gobject-2.0 glib-2.0" PKG_CHECK_MODULES(GOBJECT, $gobject_REQUIRES, , [AC_MSG_RESULT(no) use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)"]) - gobject_NONPKGCONFIG_LIBS="-L\%{libdir} -lcairo-gobject" + gobject_NONPKGCONFIG_EXTRA_LIBS="-L\%{libdir} -lcairo-gobject" ]) dnl =========================================================================== diff --git a/src/cairo-features-uninstalled.pc.in b/src/cairo-features-uninstalled.pc.in index cc052479..b9cd9d3a 100644 --- a/src/cairo-features-uninstalled.pc.in +++ b/src/cairo-features-uninstalled.pc.in @@ -3,5 +3,5 @@ Description: @FEATURE_NAME@ for cairo graphics library Version: @VERSION@ Requires: @FEATURE_BASE@ @FEATURE_REQUIRES@ -Libs: @FEATURE_NONPKGCONFIG_LIBS@ +Libs: @FEATURE_NONPKGCONFIG_LIBS@ @FEATURE_NONPKGCONFIG_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/src @FEATURE_NONPKGCONFIG_CFLAGS@ diff --git a/src/cairo-features.pc.in b/src/cairo-features.pc.in index 34908ec4..9a4b657c 100644 --- a/src/cairo-features.pc.in +++ b/src/cairo-features.pc.in @@ -8,5 +8,5 @@ Description: @FEATURE_NAME@ for cairo graphics library Version: @VERSION@ Requires: @FEATURE_BASE@ @FEATURE_REQUIRES@ -Libs: @FEATURE_NONPKGCONFIG_LIBS@ +Libs: @FEATURE_NONPKGCONFIG_LIBS@ @FEATURE_NONPKGCONFIG_EXTRA_LIBS@ Cflags: -I${includedir}/cairo @FEATURE_NONPKGCONFIG_CFLAGS@ |