|
|
49064ae |
--- pkg-config-0.21/parse.c.compat-loop 2007-01-29 16:31:15.000000000 -0500
|
|
|
49064ae |
+++ pkg-config-0.21/parse.c 2007-01-29 16:32:08.000000000 -0500
|
|
|
49064ae |
@@ -1186,61 +1186,7 @@
|
|
|
49064ae |
|
|
|
49064ae |
pkg->path_position = G_MAXINT;
|
|
|
49064ae |
|
|
|
49064ae |
- if (strcmp (name, "glib") == 0)
|
|
|
49064ae |
- {
|
|
|
49064ae |
- char *output;
|
|
|
49064ae |
-
|
|
|
49064ae |
- debug_spew ("Calling glib-config\n");
|
|
|
49064ae |
-
|
|
|
49064ae |
- pkg->version = backticks ("glib-config --version");
|
|
|
49064ae |
- if (pkg->version == NULL)
|
|
|
49064ae |
- {
|
|
|
49064ae |
- g_free (pkg);
|
|
|
49064ae |
- return NULL;
|
|
|
49064ae |
- }
|
|
|
49064ae |
-
|
|
|
49064ae |
- pkg->name = g_strdup ("GLib");
|
|
|
49064ae |
- pkg->key = g_strdup ("glib");
|
|
|
49064ae |
- pkg->description = g_strdup ("C Utility Library");
|
|
|
49064ae |
-
|
|
|
49064ae |
- output = backticks ("glib-config --libs");
|
|
|
49064ae |
- parse_libs (pkg, output, "glib-config");
|
|
|
49064ae |
- g_free (output);
|
|
|
49064ae |
-
|
|
|
49064ae |
- output = backticks ("glib-config --cflags");
|
|
|
49064ae |
- parse_cflags (pkg, output, "glib-config");
|
|
|
49064ae |
- g_free (output);
|
|
|
49064ae |
-
|
|
|
49064ae |
- return pkg;
|
|
|
49064ae |
- }
|
|
|
49064ae |
- else if (strcmp (name, "gtk+") == 0)
|
|
|
49064ae |
- {
|
|
|
49064ae |
- char *output;
|
|
|
49064ae |
-
|
|
|
49064ae |
- debug_spew ("Calling gtk-config\n");
|
|
|
49064ae |
-
|
|
|
49064ae |
- pkg->version = backticks ("gtk-config --version");
|
|
|
49064ae |
- if (pkg->version == NULL)
|
|
|
49064ae |
- {
|
|
|
49064ae |
- g_free (pkg);
|
|
|
49064ae |
- return NULL;
|
|
|
49064ae |
- }
|
|
|
49064ae |
-
|
|
|
49064ae |
- pkg->name = g_strdup ("GTK+");
|
|
|
49064ae |
- pkg->key = g_strdup ("gtk+");
|
|
|
49064ae |
- pkg->description = g_strdup ("GIMP Tool Kit");
|
|
|
49064ae |
-
|
|
|
49064ae |
- output = backticks ("gtk-config --libs");
|
|
|
49064ae |
- parse_libs (pkg, output, "gtk-config");
|
|
|
49064ae |
- g_free (output);
|
|
|
49064ae |
-
|
|
|
49064ae |
- output = backticks ("gtk-config --cflags");
|
|
|
49064ae |
- parse_cflags (pkg, output, "gtk-config");
|
|
|
49064ae |
- g_free (output);
|
|
|
49064ae |
-
|
|
|
49064ae |
- return pkg;
|
|
|
49064ae |
- }
|
|
|
49064ae |
- else if (strcmp (name, "libgnomevfs") == 0)
|
|
|
49064ae |
+ if (strcmp (name, "libgnomevfs") == 0)
|
|
|
49064ae |
{
|
|
|
49064ae |
char *output;
|
|
|
49064ae |
|