From 650d0a6ab6df06161613412fd97a85816a4248db Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:06:47 +0000 Subject: [PATCH] 2005-04-02 Tollef Fog Heen Author: tfheen Date: 2005-04-02 09:06:39 GMT 2005-04-02 Tollef Fog Heen * parse.c (parse_libs): Handle -framework as a single argument. (Freedesktop #1278) --- ChangeLog | 3 +++ parse.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7f8579e..c8c2ab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-02 Tollef Fog Heen + * 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 5fb45f6..ee0ccaa 100644 --- 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') -- 2.39.5