2005-04-02 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-04-02 09:06:39 GMT
 2005-04-02  Tollef Fog Heen  <tfheen@err.no>

       * parse.c (parse_libs): Handle -framework as a single argument.
       (Freedesktop #1278)

diff --git a/ChangeLog b/ChangeLog
index 7f8579e56209ed9edb7091d9553cefc625df429f..c8c2ab0c7a855d78e2580949439293c9b2add774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-02  Tollef Fog Heen  <tfheen@err.no>
 
+       * parse.c (parse_libs): Handle -framework as a single argument.
+       (Freedesktop #1278)
+
        * configure.in: Remove extraneous " from --with-pc-path's help
 
        * glib-patches/mkinstalldirs.update.diff: cvs admin -ko to avoid

diff --git a/parse.c b/parse.c
index 5fb45f674956c4f7d82fee228b2a9a1e6e79786b..ee0ccaa1f5210fe46d2bcfec13184ec39df2084a 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -670,6 +670,20 @@ parse_libs (Package *pkg, const char *str, const char *path)
 
           g_free (libname);
         }
+      else if (strcmp("-framework",p) == 0 && i+1 < argc)
+        {
+          /* Mac OS X has a -framework Foo which is really one option,
+           * so we join those to avoid having -framework Foo
+           * -framework Bar being changed into -framework Foo Bar
+           * later
+          */
+          gchar *framework = trim_string (argv[i+1]);
+
+          pkg->other_libs = g_slist_prepend (pkg->other_libs,
+                                             g_strconcat(arg, " ", framework, NULL));
+          i++;
+          g_free(framework);
+        }
       else
         {
           if (*arg != '\0')