From 9af76876328742175c8cd702f74ebb8e9ca0c521 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 22 Jun 2014 10:43:00 -0700 Subject: [PATCH] Use ARCHIVE_VERSION macros instead of PACKAGE --- libarchive/archive.h | 7 ++++++- libarchive/archive_write_set_format_warc.c | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libarchive/archive.h b/libarchive/archive.h index 49a39e5fa..b199d3fb3 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -130,11 +130,16 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 3.1.2" +#define ARCHIVE_VERSION_ONLY_STRING "3.1.2" +#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); /* * Detailed textual name/version of the library and its dependencies. + * This has the form: + * "libarchive x.y.z zlib/a.b.c liblzma/d.e.f ... etc ..." + * the list of libraries described here will vary depending on how + * libarchive was compiled. */ __LA_DECL const char * archive_version_details(void); diff --git a/libarchive/archive_write_set_format_warc.c b/libarchive/archive_write_set_format_warc.c index cd1fde9f9..e01342715 100644 --- a/libarchive/archive_write_set_format_warc.c +++ b/libarchive/archive_write_set_format_warc.c @@ -58,9 +58,9 @@ struct warc_s { size_t populz; }; -static const char warcinfo[] = "\ -software: " PACKAGE_NAME "/" PACKAGE_VERSION "\r\n\ -format: WARC file version 1.0\r\n"; +static const char warcinfo[] = + "software: libarchive/" ARCHIVE_VERSION_ONLY_STRING "\r\n" + "format: WARC file version 1.0\r\n"; typedef enum { WT_NONE, -- 2.47.2