From ce94c4d30b5bb52c4572ee32e69b65e4f12c4e47 Mon Sep 17 00:00:00 2001
From: Elms <jeff@wolfssl.com>
Date: Thu, 1 Jul 2021 11:37:10 -0700
Subject: [PATCH] Fix `--prefix` without also needing `--with-wolfcrypt`

During addition of `--with-wolfcrypt` prefix option was ignored for
include and link paths unless also specified via `--with-wolfcrypt`.

Use prefix as default and set flags in `enable-wolfcrypt` section
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1cd04f4..bafe56c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@ fi
 # wolfSSL/wolfCrypt
 AC_MSG_CHECKING([for wolfSSL/wolfCrypt
 ])
-wcpath="/usr/local/"
+wcpath=$prefix
 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)])],
@@ -141,8 +141,6 @@ AC_ARG_WITH(wolfcrypt,
         AC_MSG_ERROR([wolfCrypt path error (${withval}): missing lib and include])
       fi
     fi
-    LDFLAGS="$LDFLAGS -L${wcpath}/lib"
-    CPPFLAGS="$CPPFLAGS -I${wcpath}/include"    
   ]
 )
 
@@ -155,6 +153,8 @@ AC_ARG_ENABLE([wolfcrypt],
 if test "x$ENABLED_WOLFCRYPT" = "xyes"
 then
     LIBS="$LIBS -lwolfssl"
+    LDFLAGS="$LDFLAGS -L${wcpath}/lib"
+    CPPFLAGS="$CPPFLAGS -I${wcpath}/include"
 
     AC_LIB_HAVE_LINKFLAGS(wolfssl,,
     [