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

main: move our actual version text to --about, make --version print pkg-config API version 

This improves compatibility with broken packages, but really, scripts should depend on:
- --atleast-pkgconfig-version
- --modversion pkg-config

Anything else is just broken, but oh well.
pull/36/head
William Pitcock 2012-07-29 03:20:24 -05:00
parent 24bb536305
commit 3715fae236
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.c
View File

@ -422,6 +422,12 @@ out:
static void static void
version(void) version(void)
{
printf("%s\n", PKG_PKGCONFIG_VERSION_EQUIV);
}
static void
about(void)
{ {
printf("%s %s%s\n", PACKAGE_NAME, PACKAGE_VERSION, HAVE_STRICT_MODE ? " [strict]" : " [pkg-config compatible]"); printf("%s %s%s\n", PACKAGE_NAME, PACKAGE_VERSION, HAVE_STRICT_MODE ? " [strict]" : " [pkg-config compatible]");
printf("Copyright (c) 2011 - 2012 pkgconf authors (see AUTHORS in documentation directory).\n\n"); printf("Copyright (c) 2011 - 2012 pkgconf authors (see AUTHORS in documentation directory).\n\n");
@ -500,9 +506,11 @@ main(int argc, char *argv[])
int want_cflags_I = 0; int want_cflags_I = 0;
int want_cflags_other = 0; int want_cflags_other = 0;
int want_list = 0; int want_list = 0;
int want_about = 0;
struct pkg_option options[] = { struct pkg_option options[] = {
{ "version", no_argument, &want_version, 1, }, { "version", no_argument, &want_version, 1, },
{ "about", no_argument, &want_about, 1, },
{ "atleast-version", required_argument, NULL, 2, }, { "atleast-version", required_argument, NULL, 2, },
{ "atleast-pkgconfig-version", required_argument, NULL, 3, }, { "atleast-pkgconfig-version", required_argument, NULL, 3, },
{ "libs", no_argument, &want_libs, 4, }, { "libs", no_argument, &want_libs, 4, },
@ -585,6 +593,12 @@ main(int argc, char *argv[])
else if (want_cflags_other) else if (want_cflags_other)
want_cflags = want_cflags_other; want_cflags = want_cflags_other;
if (want_about)
{
about();
return EXIT_SUCCESS;
}
if (want_version) if (want_version)
{ {
version(); version();