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

[aclocal] Fix pkgconfig file collection

Browse source
This commit is contained in:
Behdad Esfahbod 2008-09-16 02:45:00 -04:00
parent 8151c50670
commit 88a3998a1d
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/aclocal.makefile.m4
View file

@ -146,12 +146,13 @@ dnl
AC_DEFUN([CAIRO_MAKEFILE_ACCUMULATE_FEATURE],
[dnl
m4_if([$1],[*],,[_CAIRO_MAKEFILE_CHECK([$1])])dnl
m4_pushdef([cr_make_acc_contents],[$5])dnl
m4_append([cr_make_acc_counter],[1],[])dnl
m4_define([cr_make_acc_contents]m4_len(cr_make_acc_counter), [$5])dnl
CAIRO_FEATURE_HOOK_REGISTER(*,[$3],[$4],
[dnl
m4_foreach_w([cr_makefile], m4_if([$1],[*],_CAIRO_MAKEFILES,[$1]),
[dnl
cr_make_tmp=_CAIRO_SH_ESCAPE(]]cr_make_acc_contents([[[[]]]]cr_makefile(),[$][1],[$][2],[$][3],[$][4])[[)
cr_make_tmp=_CAIRO_SH_ESCAPE(cr_make_acc_contents]]m4_len(cr_make_acc_counter)([[cr_makefile,]][$][1],[$][2],[$][3],[$][4])[[)
_CAIRO_MAKEFILE_ACCUMULATE_FEATURE(
[MAKEFILE_]cr_makefile[_AMAKE],
[$2],
@ -164,6 +165,6 @@ AC_DEFUN([CAIRO_MAKEFILE_ACCUMULATE_FEATURE],
[$cr_make_tmp])dnl
])dnl
])dnl
m4_popdef([cr_make_acc_contents])dnl
])dnl
m4_define([cr_make_acc_counter])dnl

4
build/configure.ac.features
View file

@ -200,13 +200,13 @@ CAIRO_FEATURE_HOOK_REGISTER(yes,!always,!,
dnl Collect list of .pc files for all non-builtin public features
CAIRO_MAKEFILE_ACCUMULATE(cairo,
[all_$1_pkgconf = cairo.pc])dnl
CAIRO_MAKEFILE_ACCUMULATE_FEATURE(cairo,*,*,!,
CAIRO_MAKEFILE_ACCUMULATE_FEATURE(cairo,*,!always,!,
[all_$1_pkgconf += cr_feature_pc])dnl
dnl Collect list of .pc files for enabled non-builtin public features
CAIRO_MAKEFILE_ACCUMULATE(cairo,
[enabled_$1_pkgconf = cairo.pc])dnl
CAIRO_MAKEFILE_ACCUMULATE_FEATURE(cairo,yes,*,!,
CAIRO_MAKEFILE_ACCUMULATE_FEATURE(cairo,yes,!always,!,
[enabled_$1_pkgconf += cr_feature_pc])dnl