From 8101619fdc5c3b0faff5d49f0e07c3a38ef63fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 3 Aug 2010 13:48:47 +0000
Subject: [PATCH] added version info, refs #4

---
 configure.in                      |  2 ++
 doc/examples/cryptoki-demo.cxx    |  1 +
 doc/examples/makefile.am          | 16 ++++++++++------
 doc/examples/openssl-ssl-demo.cxx |  1 +
 doc/examples/openssl-tcp-demo.cxx |  1 +
 doc/examples/pcsc-demo.cxx        |  1 +
 install-64-and-32-bit-linux.sh    |  2 +-
 src/cryptoki.hxx                  |  4 ++++
 src/makefile.am                   |  5 ++++-
 src/openssl.hxx                   |  5 ++++-
 src/pcsc.hxx                      |  5 +++++
 src/version.cxx                   | 16 ++++++++++++++++
 12 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 src/version.cxx

diff --git a/configure.in b/configure.in
index 5475751..e16eceb 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,8 @@ AC_SUBST_FILE(README)
 CHANGE_LOG=ChangeLog
 AC_SUBST_FILE(CHANGE_LOG)
 
+AM_CPPFLAGS="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"
+
 # Get rid of that stupid -O2 -g opions!
 CXXFLAGS="${CXXFLAGS:-}"
 
diff --git a/doc/examples/cryptoki-demo.cxx b/doc/examples/cryptoki-demo.cxx
index 241f084..15e65ff 100644
--- a/doc/examples/cryptoki-demo.cxx
+++ b/doc/examples/cryptoki-demo.cxx
@@ -14,6 +14,7 @@ int main(int argc, char const*const*const argv) try {
 //   print(v);
   cryptoki::Init init(argc==2?argv[1]:"onepin-opensc-pkcs11.so");
   cryptoki::Info inf(init.info());
+  std::cout<<"Library-Version: "<<pcsc::version()<<std::endl;
   std::cout<<"##################### INFO #####################"<<std::endl
            <<"cryptokiVersion: \""<<(int)inf.cryptokiVersion.major
            <<'.'<<(int)inf.cryptokiVersion.minor<<'"'<<std::endl
diff --git a/doc/examples/makefile.am b/doc/examples/makefile.am
index 4f78a42..d41b696 100644
--- a/doc/examples/makefile.am
+++ b/doc/examples/makefile.am
@@ -11,10 +11,12 @@ AM_CPPFLAGS += -I/usr/include/PCSC
 endif
 
 pcsc_demo_SOURCES = pcsc-demo.cxx
+pcsc_demo_LDFLAGS = -L${top_builddir}/src
+pcsc_demo_LDADD = -lcryptoki++
 if MINGW32
-pcsc_demo_LDADD = /opt/local/i586-mingw32msvc/lib/winscard.a
+pcsc_demo_LDADD += /opt/local/i586-mingw32msvc/lib/winscard.a
 else
-pcsc_demo_LDADD = -lpcsclite -lpthread
+pcsc_demo_LDADD += -lpcsclite -ldl -lpthread
 endif
 
 cryptoki_demo_SOURCES = cryptoki-demo.cxx
@@ -28,18 +30,20 @@ endif
 
 openssl_tcp_demo_SOURCES = openssl-tcp-demo.cxx
 openssl_tcp_demo_LDFLAGS = -L${top_builddir}/src
+openssl_tcp_demo_LDADD = -lcryptoki++
 if MINGW32
-openssl_tcp_demo_LDADD = /opt/local/i586-mingw32msvc/lib/ssleay32.a /opt/local/i586-mingw32msvc/lib/libeay32.a
+openssl_tcp_demo_LDADD += /opt/local/i586-mingw32msvc/lib/ssleay32.a /opt/local/i586-mingw32msvc/lib/libeay32.a
 else
-openssl_tcp_demo_LDADD = -ldl -lpthread -lssl
+openssl_tcp_demo_LDADD += -ldl -lpthread -lssl
 endif
 
 openssl_ssl_demo_SOURCES = openssl-ssl-demo.cxx
 openssl_ssl_demo_LDFLAGS = -L${top_builddir}/src
+openssl_ssl_demo_LDADD = -lcryptoki++
 if MINGW32
-openssl_ssl_demo_LDADD = /opt/local/i586-mingw32msvc/lib/ssleay32.a /opt/local/i586-mingw32msvc/lib/libeay32.a
+openssl_ssl_demo_LDADD += /opt/local/i586-mingw32msvc/lib/ssleay32.a /opt/local/i586-mingw32msvc/lib/libeay32.a
 else
-openssl_ssl_demo_LDADD = -ldl -lpthread -lssl
+openssl_ssl_demo_LDADD += -ldl -lpthread -lssl
 endif
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/doc/examples/openssl-ssl-demo.cxx b/doc/examples/openssl-ssl-demo.cxx
index 9b1a76e..7a1ed72 100644
--- a/doc/examples/openssl-ssl-demo.cxx
+++ b/doc/examples/openssl-ssl-demo.cxx
@@ -14,6 +14,7 @@ int main(int argc, char** argv) try {
   std::string host(argc>1?argv[1]:"dev.swisssign.com");
   std::string port(argc>2?argv[2]:"443");
   std::string path(argc>3?argv[3]:"/");
+  std::cout<<"Library-Version: "<<pcsc::version()<<std::endl;
   std::cout<<"Connect to: "<<host<<':'<<port<<std::endl;
   openssl::SSL ssl
     (openssl::TrustStore("/usr/lib/ssl/certs/SwissSign_Gold_CA_-_G2.pem"));
diff --git a/doc/examples/openssl-tcp-demo.cxx b/doc/examples/openssl-tcp-demo.cxx
index e3ec78a..8daebfa 100644
--- a/doc/examples/openssl-tcp-demo.cxx
+++ b/doc/examples/openssl-tcp-demo.cxx
@@ -13,6 +13,7 @@ int main(int argc, char** argv) try {
   openssl::Init init;
   std::string host(argc>1?argv[1]:"swisssign.com");
   std::string port(argc>2?argv[2]:"80");
+  std::cout<<"Library-Version: "<<pcsc::version()<<std::endl;
   std::cout<<"Connect to: "<<host<<':'<<port<<std::endl;
   openssl::TCP ssl(host+':'+port);
   ssl<<"GET / HTTP/1.1\x0D\x0AHost: "<<host
diff --git a/doc/examples/pcsc-demo.cxx b/doc/examples/pcsc-demo.cxx
index 5f40f02..a293b32 100644
--- a/doc/examples/pcsc-demo.cxx
+++ b/doc/examples/pcsc-demo.cxx
@@ -5,6 +5,7 @@
 int main(int, char const*const*const argv) try {
   pcsc::Connection c;
   pcsc::Connection::Strings reader(c.scan());
+  std::cout<<"Library-Version: "<<pcsc::version()<<std::endl;
   std::cout<<"Suche PCSC-Reader ..."<<std::endl;
   if (!reader.size()) std::cout<<"Keine gefunden."<<std::endl;
   for (pcsc::Connection::Strings::const_iterator it(reader.begin());
diff --git a/install-64-and-32-bit-linux.sh b/install-64-and-32-bit-linux.sh
index 0a08d71..8cc55df 100755
--- a/install-64-and-32-bit-linux.sh
+++ b/install-64-and-32-bit-linux.sh
@@ -1,5 +1,5 @@
 ./bootstrap.sh && \
-LDFLAGS="-L/usr/lib32 -m32" \
+LDFLAGS="-L/usr/lib32 -L/usr/local/lib32 -m32" \
   CXXFLAGS="-m32" \
   CPPFLAGS="-DCRYPTOKI_LOG\(X\)='std::clog<<X<<"'"@"'"<<__PRETTY_FUNCTION__<<std::endl'" \
   ./configure \
diff --git a/src/cryptoki.hxx b/src/cryptoki.hxx
index 3d03c21..7faf689 100644
--- a/src/cryptoki.hxx
+++ b/src/cryptoki.hxx
@@ -79,6 +79,10 @@
   #endif
 #endif
 
+namespace pcsc {
+  std::string version();
+}
+
 //! @see gcryptoki
 namespace cryptoki {
 
diff --git a/src/makefile.am b/src/makefile.am
index 2d21d56..f878122 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -17,8 +17,11 @@ EXTRA_DIST = $(pkgconfig_DATA).in $(shell ls -1 *.doc)
 
 lib_LTLIBRARIES = libcryptoki++.la
 
-libcryptoki___la_SOURCES = cryptoki.cxx cryptoki.hxx
+libcryptoki___la_SOURCES = cryptoki.cxx cryptoki.hxx version.cxx
 libcryptoki___la_LIBADD = -lssl
+if !MINGW32
+libcryptoki___la_LIBADD += -lpcsclite
+endif
 
 clean-local:
 	-rm -r ${QMAKE_TARGET}.app
diff --git a/src/openssl.hxx b/src/openssl.hxx
index 9a11d76..dc58680 100644
--- a/src/openssl.hxx
+++ b/src/openssl.hxx
@@ -23,6 +23,10 @@
 #include <cstdio>
 #include <cassert>
 
+namespace pcsc {
+  std::string version();
+}
+
 #ifndef OPENSSL_LOG
   #include <iostream>
   #if __GNUC__ >= 2
@@ -51,7 +55,6 @@
 //! @see gopenssl
 namespace openssl {
 
-
   //============================================================================
   //! @addtogroup opensslexceptions
   //@{
diff --git a/src/pcsc.hxx b/src/pcsc.hxx
index 9108caf..d8362d9 100644
--- a/src/pcsc.hxx
+++ b/src/pcsc.hxx
@@ -41,6 +41,7 @@
     #define MAX_ATR_SIZE 33
   #endif
   namespace pcsc {
+    
     #ifdef UNICODE
       inline std::wstring strconv(std::string s) {
         return std::wstring(s.begin(), s.end());
@@ -76,6 +77,10 @@
 #include <map>
 #include <memory>
 
+namespace pcsc {
+  std::string version();
+}
+
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/version.cxx b/src/version.cxx
new file mode 100644
index 0000000..ddcd7ce
--- /dev/null
+++ b/src/version.cxx
@@ -0,0 +1,16 @@
+/*! @file
+
+    @id $Id$
+*/
+//       1         2         3         4         5         6         7         8
+// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+#include <string>
+
+namespace pcsc {
+  std::string version() {
+    return PACKAGENAME "-" PACKAGEVERSION;
+  }
+  const std::string IDENT("$Id: " PACKAGENAME "-" PACKAGEVERSION " $");
+  const std::string WHAT("#(@)" PACKAGENAME "-" PACKAGEVERSION);
+}