Skip to content

Commit 2b3ebea

Browse files
authored
Merge pull request #177 from elms/autotools/fix_prefix
Fix `--prefix` without also needing `--with-wolfcrypt`
2 parents dd76641 + ce94c4d commit 2b3ebea

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fi
129129
# wolfSSL/wolfCrypt
130130
AC_MSG_CHECKING([for wolfSSL/wolfCrypt
131131
])
132-
wcpath="/usr/local/"
132+
wcpath=$prefix
133133
WOLFSSL_URL="http://www.wolfssl.com/download.html"
134134
AC_ARG_WITH(wolfcrypt,
135135
[AC_HELP_STRING([--with-wolfcrypt=PATH], [PATH to wolfssl install (default /usr/local)])],
@@ -141,8 +141,6 @@ AC_ARG_WITH(wolfcrypt,
141141
AC_MSG_ERROR([wolfCrypt path error (${withval}): missing lib and include])
142142
fi
143143
fi
144-
LDFLAGS="$LDFLAGS -L${wcpath}/lib"
145-
CPPFLAGS="$CPPFLAGS -I${wcpath}/include"
146144
]
147145
)
148146

@@ -155,6 +153,8 @@ AC_ARG_ENABLE([wolfcrypt],
155153
if test "x$ENABLED_WOLFCRYPT" = "xyes"
156154
then
157155
LIBS="$LIBS -lwolfssl"
156+
LDFLAGS="$LDFLAGS -L${wcpath}/lib"
157+
CPPFLAGS="$CPPFLAGS -I${wcpath}/include"
158158

159159
AC_LIB_HAVE_LINKFLAGS(wolfssl,,
160160
[

0 commit comments

Comments
 (0)