From 2bd655985a6ac452e1ca6841f6f6ff77487499a6 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 3 Sep 2015 03:29:35 -0500 Subject: [PATCH] main: remove remaining parts of the pkg-config compatibility layer --- main.c | 6 +++--- pkg.c | 2 +- pkg.h | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 6947126..5069fce 100644 --- a/main.c +++ b/main.c @@ -500,13 +500,13 @@ apply_simulate(pkg_t *world, void *data, int maxdepth, unsigned int flags) static void version(void) { - printf("%s\n", PKG_PKGCONFIG_VERSION_EQUIV); + printf("%s\n", PACKAGE_VERSION); } static 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("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"); @@ -734,7 +734,7 @@ main(int argc, char *argv[]) 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_FAILURE; diff --git a/pkg.c b/pkg.c index 752b7f8..f6dab86 100644 --- a/pkg.c +++ b/pkg.c @@ -631,7 +631,7 @@ static pkg_t pkg_config_virtual = { .realname = "pkg-config", .description = "virtual package defining pkg-config API version supported", .url = PACKAGE_BUGREPORT, - .version = PKG_PKGCONFIG_VERSION_EQUIV, + .version = PACKAGE_VERSION, .flags = PKG_PROPF_VIRTUAL, .vars = { .head = &(pkg_node_t){ diff --git a/pkg.h b/pkg.h index 83add6f..b6bd1c9 100644 --- a/pkg.h +++ b/pkg.h @@ -22,9 +22,6 @@ #define PKG_BUFSIZE (65535) -/* we are compatible with 0.28 of pkg-config */ -#define PKG_PKGCONFIG_VERSION_EQUIV "0.28" - typedef enum { PKG_ANY = 0, PKG_LESS_THAN,