Skip to content

Commit a07c4f2

Browse files
author
Andras Fekete
committed
Clarify variable name
1 parent ed3ae37 commit a07c4f2

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ test: check
3939
#
4040
# The '--with-wolfssl' doesn't get propagated during a distcheck either, but it
4141
# is necessary when they are installed somewhere other than /usr/local.
42-
AM_DISTCHECK_CONFIGURE_FLAGS="--with-openssl=@OPENSSL_DIR@ --with-wolfssl=@WOLFSSL_DIR@"
42+
AM_DISTCHECK_CONFIGURE_FLAGS="--with-openssl=@OPENSSL_INSTALL_DIR@ --with-wolfssl=@WOLFSSL_INSTALL_DIR@"
4343

m4/m4_ax_check_openssl.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
5555
if test x"$PKG_CONFIG" != x""; then
5656
OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
5757
if test $? = 0; then
58-
OPENSSL_DIR=`$PKG_CONFIG openssl --libs-only-I 2>/dev/null`"/.."
58+
OPENSSL_INSTALL_DIR=`$PKG_CONFIG openssl --libs-only-I 2>/dev/null`"/.."
5959
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
6060
OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
6161
found=true
@@ -78,7 +78,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
7878
for ssldir in $ssldirs; do
7979
AC_MSG_CHECKING([for include/openssl/ssl.h in $ssldir])
8080
if test -f "$ssldir/include/openssl/ssl.h"; then
81-
OPENSSL_DIR="$ssldir"
81+
OPENSSL_INSTALL_DIR="$ssldir"
8282
OPENSSL_INCLUDES="-I$ssldir/include"
8383
OPENSSL_LDFLAGS="-L$ssldir/lib -L$ssldir/lib64"
8484
OPENSSL_LIBS="-lssl -lcrypto"

m4/m4_ax_check_wolfssl.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
5555
WOLFSSL_LDFLAGS=`$PKG_CONFIG wolfssl --libs-only-L 2>/dev/null`
5656
if test $? = 0; then
5757
# Hack to get the folder wolfssl is installed in
58-
WOLFSSL_DIR=`$PKG_CONFIG wolfssl --libs-only-I 2>/dev/null`"/.."
58+
WOLFSSL_INSTALL_DIR=`$PKG_CONFIG wolfssl --libs-only-I 2>/dev/null`"/.."
5959
WOLFSSL_LIBS=`$PKG_CONFIG wolfssl --libs-only-l 2>/dev/null`
6060
WOLFSSL_INCLUDES=`$PKG_CONFIG wolfssl --cflags-only-I 2>/dev/null`
6161
found=true
@@ -78,7 +78,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
7878
for wolfssldir in $wolfssldirs; do
7979
AC_MSG_CHECKING([for include/wolfssl/ssl.h in $wolfssldir])
8080
if test -f "$wolfssldir/include/wolfssl/ssl.h"; then
81-
WOLFSSL_DIR="$wolfssldir"
81+
WOLFSSL_INSTALL_DIR="$wolfssldir"
8282
WOLFSSL_INCLUDES="-I$wolfssldir/include"
8383
WOLFSSL_LDFLAGS="-L$wolfssldir/lib"
8484
WOLFSSL_LIBS="-lwolfssl"

0 commit comments

Comments
 (0)