From 8ee39ebfe9c847eb60cd6928f9a2c3069b4f04f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 22 Jul 2015 10:04:40 +0000
Subject: [PATCH] mingw/windows-build works

---
 ax_init_standard_project.m4 | 17 +++++++++--------
 configure.ac                |  7 +++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index d2fd59d..870b57b 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -108,6 +108,15 @@ AC_DEFUN([AX_SUBST], [
 #
 # configures the basic environment
 AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
+  MINGW=no
+  MAC=no
+  case $host in
+    *mingw*) MINGW=yes;;
+    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
+  esac
+  AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
+  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
+
   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
@@ -189,14 +198,6 @@ AC_DEFUN([AX_USE_CXX], [
   AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
   AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
 
-  MINGW=no
-  MAC=no
-  case $host_os in
-    *mingw*) MINGW=yes;;
-    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
-  esac
-  AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
-  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
   
   AC_SUBST(AM_CXXFLAGS)
   AC_SUBST(AM_CPPFLAGS)
diff --git a/configure.ac b/configure.ac
index 83e5ace..a39028b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,14 @@ CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
 
 # libraries used
 if test "$MINGW" = "no"; then
+   AC_MSG_ERROR([SCHEISSE: $host_os → $MINGW])
    AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h])
+   AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [libpkcs11-helper-1])
+   AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl])
+else
+  LDFLAGS+=" -lwinscard -lssl -lcrypto"
 fi
-AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl])
 AX_PKG_REQUIRE([mrwcxx], [mrw-c++], [mrw/checkcxx11.hxx])
-AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [libpkcs11-helper-1])
 
 # create output
 AC_OUTPUT