Migrate fix for non-standard location of openssl/wolfssl

Author: Andras Fekete

Makefile.am

@@ -39,9 +39,10 @@ test: check
 # OpenSSL isn't installed in a standard location, this naked configure command
 # will fail to find it. We tell it where to find the include and lib directory
 # for OpenSSL here.
-AM_DISTCHECK_CONFIGURE_FLAGS=CPPFLAGS="-I@abs_top_srcdir@/include \
-                                         @OPENSSL_INCLUDES@" \
-                             LDFLAGS="@OPENSSL_LDFLAGS@"
+#
+# 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" --with-openssl=@OPENSSL_INSTALL_DIR@ --with-wolfssl=@WOLFSSL_INSTALL_DIR@
 
 EXTRA_DIST += README.md \
               engine.conf \

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_INSTALL_DIR=`$PKG_CONFIG openssl --cflags-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_INSTALL_DIR="$ssldir"
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib"
                 OPENSSL_LIBS="-lssl -lcrypto"
@@ -114,6 +116,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
         $2
     fi
 
+    AC_SUBST([OPENSSL_INSTALL_DIR])
     AC_SUBST([OPENSSL_INCLUDES])
     AC_SUBST([OPENSSL_LIBS])
     AC_SUBST([OPENSSL_LDFLAGS])

m4/m4_ax_check_wolfssl.m4

@@ -48,6 +48,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
             # then use that information and don't search wolfssldirs
             AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
             if test x"$PKG_CONFIG" != x""; then
+                WOLFSSL_INSTALL_DIR=`$PKG_CONFIG wolfssl --cflags-only-I 2>/dev/null`"/.."
                 WOLFSSL_LDFLAGS=`$PKG_CONFIG wolfssl --libs-only-L 2>/dev/null`
                 if test $? = 0; then
                     WOLFSSL_LIBS=`$PKG_CONFIG wolfssl --libs-only-l 2>/dev/null`
@@ -72,6 +73,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_INSTALL_DIR="$wolfssldir"
                 WOLFSSL_INCLUDES="-I$wolfssldir/include"
                 WOLFSSL_LDFLAGS="-L$wolfssldir/lib"
                 WOLFSSL_LIBS="-lwolfssl"
@@ -96,6 +98,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
         $2
     fi
 
+    AC_SUBST([WOLFSSL_INSTALL_DIR])
     AC_SUBST([WOLFSSL_INCLUDES])
     AC_SUBST([WOLFSSL_LIBS])
     AC_SUBST([WOLFSSL_LDFLAGS])