From f53c187f435fac74fed3df3b09ae071f1f6709ee Mon Sep 17 00:00:00 2001
From: "Devolder, Eric" <eric.devolder@mastercard.com>
Date: Wed, 19 Dec 2018 17:50:59 +0100
Subject: [PATCH] issue 001 resolution

---
 configure    | 18 +-----------------
 configure.ac |  4 ++--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/configure b/configure
index 8fed85d4..fae1ca5f 100755
--- a/configure
+++ b/configure
@@ -26370,22 +26370,7 @@ fi
 
 hasncipher="no"
 if test "x$with_ncipher" != xno; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for include/cryptoki/ncipher.h" >&5
-$as_echo_n "checking for include/cryptoki/ncipher.h... " >&6; }
-if ${ac_cv_file_include_cryptoki_ncipher_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "include/cryptoki/ncipher.h"; then
-  ac_cv_file_include_cryptoki_ncipher_h=yes
-else
-  ac_cv_file_include_cryptoki_ncipher_h=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_include_cryptoki_ncipher_h" >&5
-$as_echo "$ac_cv_file_include_cryptoki_ncipher_h" >&6; }
-if test "x$ac_cv_file_include_cryptoki_ncipher_h" = xyes; then :
+  if test -r $srcdir/include/cryptoki/ncipher.h; then :
 
 $as_echo "#define HAVE_NCIPHER 1" >>confdefs.h
 
@@ -26400,7 +26385,6 @@ See \`config.log' for more details" "$LINENO" 5; }
                fi
 
 fi
-
 fi
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
diff --git a/configure.ac b/configure.ac
index ea7447f5..d351f72d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ AC_ARG_WITH([ncipher],
 
 hasncipher="no"
 AS_IF([test "x$with_ncipher" != xno],
-      [AC_CHECK_FILE([include/cryptoki/ncipher.h],
+      [AS_IF([test -r $srcdir/include/cryptoki/ncipher.h],
               [AC_DEFINE([HAVE_NCIPHER], [1], [define to compile with the nCipher extensions.])
 	      hasncipher="yes"
               ],
@@ -108,7 +108,7 @@ AS_IF([test "x$with_ncipher" != xno],
                  AC_MSG_FAILURE(
                    [--with-ncipher was given, but required ncipher.h include file missing])
                fi
-              ])])
+              ] )])
 
 dnl check endianness
 AC_C_BIGENDIAN