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

diff --git a/ChangeLog b/ChangeLog
index 92fee0f75b29d4ab1d016922023cc66a84dd4d17..4d3c92fcd474169ad6e2f125433f999e8476389c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 

diff --git a/pkg.c b/pkg.c
index e200a52b6edc82bbc05bc0800942261cd91e2f81..6904bca77e8a0b67e23d5e8dce2ae3ab20dc143b 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -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 *