From 7ac159116c008250e2e7e74fa52fd64626eae973 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 18 May 2021 09:36:48 -0700
Subject: [PATCH] Improve the `--with-wolfcrypt=` logic and print path used
 (`configure: wolfCrypt path: /usr/local/`).

---
 configure.ac | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index b3a51d0..7e6d598 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,24 +126,23 @@ then
 fi
 
 
-# wolfCrypt
-AC_MSG_CHECKING([for wolfSSL])
+# wolfSSL/wolfCrypt
+AC_MSG_CHECKING([for wolfSSL/wolfCrypt
+])
+wcpath="/usr/local/"
 WOLFSSL_URL="http://www.wolfssl.com/download.html"
 AC_ARG_WITH(wolfcrypt,
   [AC_HELP_STRING([--with-wolfcrypt=PATH], [PATH to wolfssl install (default /usr/local)])],
   [
     if test "x$withval" != "xno" ; then
-      if test -d "$withval/lib"; then
-        LDFLAGS="$LDFLAGS -L${withval}/lib"
-      fi
-      if test -d "$withval/include"; then
-        CPPFLAGS="$CPPFLAGS -I${withval}/include"
+      if test -d "${withval}/lib" && test -d "${withval}/include"; then 
+        wcpath=${withval}
+      else
+        AC_MSG_ERROR([wolfCrypt path error (${withval}): missing lib and include])
       fi
     fi
-    if test "x$withval" = "xyes" ; then
-      LDFLAGS="$LDFLAGS -L/usr/local/lib"
-      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-    fi
+    LDFLAGS="$LDFLAGS -L${wcpath}/lib"
+    CPPFLAGS="$CPPFLAGS -I${wcpath}/include"    
   ]
 )
 
@@ -179,7 +178,7 @@ then
 else
     AM_CFLAGS="$AM_CFLAGS -DWOLFTPM2_NO_WOLFCRYPT"
 fi
-
+AC_MSG_NOTICE([wolfCrypt path: ${wcpath}])
 
 
 # I2C Support