ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

main: add --atleast-version

pull/1/merge
William Pitcock 2011-07-26 18:47:42 -05:00
parent 8b721a263c
commit 5a6a586a76
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main.c
View File

@ -37,6 +37,7 @@ static int want_static = 0;
static int maximum_traverse_depth = 2; static int maximum_traverse_depth = 2;
static char *required_pkgconfig_version = NULL; static char *required_pkgconfig_version = NULL;
static char *required_module_version = NULL;
static char *want_variable = NULL; static char *want_variable = NULL;
static void static void
@ -165,6 +166,7 @@ main(int argc, const char *argv[])
struct poptOption options[] = { struct poptOption options[] = {
{ "version", 0, POPT_ARG_NONE, &want_version, 0, "output pkgconf version" }, { "version", 0, POPT_ARG_NONE, &want_version, 0, "output pkgconf version" },
{ "atleast-version", 0, POPT_ARG_STRING, &required_module_version, 0, "require specified version of a module" },
{ "atleast-pkgconfig-version", 0, POPT_ARG_STRING, &required_pkgconfig_version, 0, "require compatibility level with specified version of pkg-config" }, { "atleast-pkgconfig-version", 0, POPT_ARG_STRING, &required_pkgconfig_version, 0, "require compatibility level with specified version of pkg-config" },
{ "libs", 0, POPT_ARG_NONE, &want_libs, 0, "output all linker flags" }, { "libs", 0, POPT_ARG_NONE, &want_libs, 0, "output all linker flags" },
{ "cflags", 0, POPT_ARG_NONE, &want_cflags, 0, "output all compiler flags" }, { "cflags", 0, POPT_ARG_NONE, &want_cflags, 0, "output all compiler flags" },
@ -206,6 +208,25 @@ main(int argc, const char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (required_module_version != NULL)
{
pkg_t *pkg;
const char *package;
package = poptGetArg(opt_context);
if (package == NULL)
return EXIT_SUCCESS;
pkg = pkg_find(package);
if (pkg == NULL)
return EXIT_FAILURE;
if (pkg_compare_version(pkg->version, required_module_version) >= 0)
return EXIT_SUCCESS;
return EXIT_FAILURE;
}
while (1) while (1)
{ {
const char *package = poptGetArg(opt_context); const char *package = poptGetArg(opt_context);