Cleaner way to pass through the openssl/wolfssl install path

Author: Andras Fekete

Makefile.am

@@ -39,7 +39,5 @@ test: check
 #
 # The '--with-wolfssl' doesn't get propagated during a distcheck either, but it
 # is necessary when they are installed somewhere other than /usr/local.
-AM_DISTCHECK_CONFIGURE_FLAGS=CPPFLAGS="-I@abs_top_srcdir@/include \
-                                         @OPENSSL_INCLUDES@ @WOLFSSL_INCLUDES@" \
-                             LDFLAGS="@OPENSSL_LDFLAGS@ @WOLFSSL_LDFLAGS@" 
+AM_DISTCHECK_CONFIGURE_FLAGS="--with-openssl=@OPENSSL_DIR@ --with-wolfssl=@WOLFSSL_DIR@"
 

m4/m4_ax_check_openssl.m4

@@ -55,6 +55,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
             if test x"$PKG_CONFIG" != x""; then
                 OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
                 if test $? = 0; then
+                    OPENSSL_DIR=`$PKG_CONFIG openssl --libs-only-I 2>/dev/null`"/.."
                     OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
                     OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
                     found=true
@@ -77,6 +78,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
         for ssldir in $ssldirs; do
             AC_MSG_CHECKING([for include/openssl/ssl.h in $ssldir])
             if test -f "$ssldir/include/openssl/ssl.h"; then
+                OPENSSL_DIR="$ssldir"
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib -L$ssldir/lib64"
                 OPENSSL_LIBS="-lssl -lcrypto"

m4/m4_ax_check_wolfssl.m4

@@ -54,6 +54,8 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
             if test x"$PKG_CONFIG" != x""; then
                 WOLFSSL_LDFLAGS=`$PKG_CONFIG wolfssl --libs-only-L 2>/dev/null`
                 if test $? = 0; then
+                    # Hack to get the folder wolfssl is installed in
+                    WOLFSSL_DIR=`$PKG_CONFIG wolfssl --libs-only-I 2>/dev/null`"/.."
                     WOLFSSL_LIBS=`$PKG_CONFIG wolfssl --libs-only-l 2>/dev/null`
                     WOLFSSL_INCLUDES=`$PKG_CONFIG wolfssl --cflags-only-I 2>/dev/null`
                     found=true
@@ -76,6 +78,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
         for wolfssldir in $wolfssldirs; do
             AC_MSG_CHECKING([for include/wolfssl/ssl.h in $wolfssldir])
             if test -f "$wolfssldir/include/wolfssl/ssl.h"; then
+                WOLFSSL_DIR="$wolfssldir"
                 WOLFSSL_INCLUDES="-I$wolfssldir/include"
                 WOLFSSL_LDFLAGS="-L$wolfssldir/lib"
                 WOLFSSL_LIBS="-lwolfssl"