From c4d439f609f7134bcfc1cb7405e333a1179db474 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Wed, 14 Dec 2005 23:48:28 +0000
Subject: [PATCH] add more version fields

---
 bindings/java/build.xml | 4 +++-
 include/sigar.h         | 2 ++
 src/sigar_version.c.in  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index c9e3fa5b..f598f686 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -101,7 +101,9 @@
     <replace file="${version.tofile}">
       <replacefilter token="@@BUILD_DATE@@" value="${BUILD_DATE}"/>
       <replacefilter token="@@VERSION_STRING@@" value="${sigar.version}"/>
-      <replacefilter token="@@ARCHNAME@@" value="${jni.project.archname}"/>
+      <replacefilter token="@@ARCHNAME@@" value="${jni.libarch}"/>
+      <replacefilter token="@@ARCHLIB@@" value="${jni.libname}"/>
+      <replacefilter token="@@BINNAME@@" value="${jni.project.archname}"/>
       <replacefilter token="@@VERSION_MAJOR@@" value="${version.major}"/>
       <replacefilter token="@@VERSION_MINOR@@" value="${version.minor}"/>
       <replacefilter token="@@VERSION_MAINT@@" value="${version.maint}"/>
diff --git a/include/sigar.h b/include/sigar.h
index 139be4f0..4900880f 100644
--- a/include/sigar.h
+++ b/include/sigar.h
@@ -598,6 +598,8 @@ typedef struct {
     const char *build_date;
     const char *version;
     const char *archname;
+    const char *archlib;
+    const char *binname;
     int major, minor, maint;
 } sigar_version_t;
 
diff --git a/src/sigar_version.c.in b/src/sigar_version.c.in
index f10edeae..d632e643 100644
--- a/src/sigar_version.c.in
+++ b/src/sigar_version.c.in
@@ -4,6 +4,8 @@ static sigar_version_t sigar_version = {
     "@@BUILD_DATE@@",
     "@@VERSION_STRING@@",
     "@@ARCHNAME@@",
+    "@@ARCHLIB@@",
+    "@@BINNAME@@",
     @@VERSION_MAJOR@@,
     @@VERSION_MINOR@@,
     @@VERSION_MAINT@@