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

main: remove remaining parts of the pkg-config compatibility layer

pull/81/head
William Pitcock 2015-09-03 03:29:35 -05:00
parent cc65d4b24a
commit 2bd655985a
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.c
View File

@ -500,13 +500,13 @@ apply_simulate(pkg_t *world, void *data, int maxdepth, unsigned int flags)
static void static void
version(void) version(void)
{ {
printf("%s\n", PKG_PKGCONFIG_VERSION_EQUIV); printf("%s\n", PACKAGE_VERSION);
} }
static void static void
about(void) about(void)
{ {
printf("%s %s%s\n", PACKAGE_NAME, PACKAGE_VERSION, HAVE_STRICT_MODE ? " [strict]" : " [pkg-config " PKG_PKGCONFIG_VERSION_EQUIV " compatible]"); printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
printf("Copyright (c) 2011, 2012, 2013, 2014, 2015 pkgconf authors (see AUTHORS in documentation directory).\n\n"); printf("Copyright (c) 2011, 2012, 2013, 2014, 2015 pkgconf authors (see AUTHORS in documentation directory).\n\n");
printf("Permission to use, copy, modify, and/or distribute this software for any\n"); printf("Permission to use, copy, modify, and/or distribute this software for any\n");
printf("purpose with or without fee is hereby granted, provided that the above\n"); printf("purpose with or without fee is hereby granted, provided that the above\n");
@ -734,7 +734,7 @@ main(int argc, char *argv[])
if (required_pkgconfig_version != NULL) if (required_pkgconfig_version != NULL)
{ {
if (pkg_compare_version(PKG_PKGCONFIG_VERSION_EQUIV, required_pkgconfig_version) >= 0) if (pkg_compare_version(PACKAGE_VERSION, required_pkgconfig_version) >= 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
return EXIT_FAILURE; return EXIT_FAILURE;

2
pkg.c
View File

@ -631,7 +631,7 @@ static pkg_t pkg_config_virtual = {
.realname = "pkg-config", .realname = "pkg-config",
.description = "virtual package defining pkg-config API version supported", .description = "virtual package defining pkg-config API version supported",
.url = PACKAGE_BUGREPORT, .url = PACKAGE_BUGREPORT,
.version = PKG_PKGCONFIG_VERSION_EQUIV, .version = PACKAGE_VERSION,
.flags = PKG_PROPF_VIRTUAL, .flags = PKG_PROPF_VIRTUAL,
.vars = { .vars = {
.head = &(pkg_node_t){ .head = &(pkg_node_t){

3
pkg.h
View File

@ -22,9 +22,6 @@
#define PKG_BUFSIZE (65535) #define PKG_BUFSIZE (65535)
/* we are compatible with 0.28 of pkg-config */
#define PKG_PKGCONFIG_VERSION_EQUIV "0.28"
typedef enum { typedef enum {
PKG_ANY = 0, PKG_ANY = 0,
PKG_LESS_THAN, PKG_LESS_THAN,