From cad79f90e9e6d6e0e717157f8cd9975199b59f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 30 Apr 2015 14:28:21 +0000
Subject: [PATCH] new tool cert2text to show certificates

---
 ChangeLog       | 34 ++++++++++++++++++++++++++++++++++
 configure.ac    |  6 +++++-
 src/makefile.am |  5 +++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 71d36cf..af76bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2015-03-15 20:08  marc
+
+	* src/libpcscxx.pc.in: linking needs crypto ssl and pcsclite
+
+2015-03-15 19:29  marc
+
+	* ax_init_standard_project.m4, src/libpcscxx.pc.in: linking needs
+	  crypto
+
+2015-03-15 16:52  marc
+
+	* configure.ac: no qt keywords
+
+2015-03-15 16:21  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  configure.ac: better build + no qt keywords
+
+2015-03-14 14:25  marc
+
+	* examples/makefile.am, src/cardgui.hxx, src/makefile.am,
+	  src/password.hxx: build fixed
+
+2015-03-14 14:05  marc
+
+	* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
+	  bootstrap.sh, configure.ac, src/libpcscxx.pc.in: wrong pkg-config
+	  prefix
+
+2015-03-14 09:51  marc
+
+	* ax_init_standard_project.m4, bootstrap.sh: missreading: doxygen
+	  -w html does not compile html onlx ...
+
 2015-03-14 09:31  marc
 
 	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
diff --git a/configure.ac b/configure.ac
index e835083..dd41277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,11 @@ AX_CHECK_QT([QTGUI], [QtCore QtGui], [QtWidgets])
 AX_CHECK_QT([QTNETWORK], [QtNetwork])
 CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
 
+# libraries used
+AX_PKG_REQUIRE([libpcsclite])
+AX_PKG_REQUIRE([libssl])
+#AX_PKG_REQUIRE([libmrw-c++])
+
 # libraries
 AC_ARG_ENABLE(pkcs11-download,
   [AS_HELP_STRING([--enable-pkcs11-download],
@@ -40,7 +45,6 @@ AC_ARG_ENABLE(pkcs11-download,
 dnl problem in libs: -Wshadow -Wcast-qual
 dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
 AC_CHECK_HEADER([pkcs11.h], [], [AC_MSG_ERROR([Header pkcs11.h is required])])
-AC_CHECK_HEADER([wintypes.h], [], [AC_MSG_ERROR([Header wintypes.h is required])])
 AC_CHECK_HEADER([mrw/checkcxx11.hxx], [], [AC_MSG_ERROR([please install mrw-c++])])
 
 # create output
diff --git a/src/makefile.am b/src/makefile.am
index 2803fe2..4cfdf78 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -42,6 +42,11 @@ libpcscxx_la_LIBADD += -lpcsclite
 endif
 endif
 
+if HAVE_QTNETWORK
+bin_PROGRAMS = cert2text
+cert2text_SOURCES = cert2text.cxx
+endif
+
 if HAVE_QTGUI
 bin_PROGRAMS = cardgui
 cardgui_SOURCES = cardgui.cxx cardgui.hxx password.hxx cardgui-model.hxx \