fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Fudge the build system some more so it handles extra libs

Browse source 
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.
This commit is contained in:
Benjamin Otte 2010-08-10 01:24:30 +02:00
parent 01325ad767
commit df8f964234
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/configure.ac.features
View file

@ -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

2
configure.ac
View file

@ -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 ===========================================================================

2
src/cairo-features-uninstalled.pc.in
View file

@ -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@

2
src/cairo-features.pc.in
View file

@ -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@