Use ARCHIVE_VERSION macros instead of PACKAGE

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 49a39e5faedfab3a0a9614224203d6d38e3f5155..b199d3fb3ccf5280a14470222815373b4e69439e 100644 (file)
--- 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 cd1fde9f9074afe39c573a8374dbd65464365c65..e01342715b7376349d9eb8b4966262c7a0fb0d2f 100644 (file)
--- 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,