From 6ac5bece8c6729d6d3a5fd8f608fdf03210c6b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 23 Jun 2015 09:02:22 +0000
Subject: [PATCH] even more improved way to find the necessary include path

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

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index ab1cf65..8de0217 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -418,7 +418,15 @@ AC_DEFUN([AX_PKG_REQUIRE], [
     CPPFLAGS=${old_CPPFLAGS}
   fi
   if test ${$1_found} -eq 0; then
-    AC_MSG_ERROR([Feature $1 not found, need header $3 in module $2 $4])
+    if test -n "$3"; then
+      if test -n "$4"; then
+        AC_MSG_ERROR([Feature $1 not found, need header $3 in modules $2 or $4])
+      else
+        AC_MSG_ERROR([Feature $1 not found, need header $3 in module $2])
+      fi
+    else
+      AC_MSG_ERROR([Feature $1 not found please install module $2])
+    fi
   fi
   AM_CPPFLAGS+=" ${$1_CFLAGS}"
   AM_CXXFLAGS+=" ${$1_CFLAGS}"
diff --git a/configure.ac b/configure.ac
index 5a5175a..3980038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
 # libraries used
 AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h])
 AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl])
-AX_PKG_REQUIRE([mrwcxx], [mrw-c++])
+AX_PKG_REQUIRE([mrwcxx], [mrw-c++], [mrw/checkcxx11.hxx])
 AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [libpkcs11-helper-1])
 
 # create output