2006-08-16 Tollef Fog Heen <tfheen@err.no>

* pkg.c (packages_get_other_cflags, package_get_other_cflags)
	(packages_get_I_cflags): Always add all cflags.  Debian #340904
This commit is contained in:
Tollef Fog Heen 2006-08-16 20:42:38 +02:00
parent 69f5752d7d
commit 0936824bf0
2 changed files with 6 additions and 3 deletions

View file

@ -1,5 +1,8 @@
2006-08-16 Tollef Fog Heen <tfheen@err.no>
* pkg.c (packages_get_other_cflags, package_get_other_cflags)
(packages_get_I_cflags): Always add all cflags. Debian #340904
* main.c (main): Always add the elements from PKG_CONFIG_PATH.
Freedesktop #4795.

6
pkg.c
View file

@ -1139,14 +1139,14 @@ char *
packages_get_I_cflags (GSList *pkgs)
{
/* sort by path position so PKG_CONFIG_PATH affects -I flag order */
return get_multi_merged (pkgs, get_I_cflags, TRUE, FALSE);
return get_multi_merged (pkgs, get_I_cflags, TRUE, TRUE);
}
char *
package_get_other_cflags (Package *pkg)
{
if (pkg->other_cflags_merged == NULL)
pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, FALSE);
pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, TRUE);
return pkg->other_cflags_merged;
}
@ -1154,7 +1154,7 @@ package_get_other_cflags (Package *pkg)
char *
packages_get_other_cflags (GSList *pkgs)
{
return get_multi_merged (pkgs, get_other_cflags, TRUE, FALSE);
return get_multi_merged (pkgs, get_other_cflags, TRUE, TRUE);
}
char *