Merge pull request #37 from bandi13/createRC

Fix issue with no openssl/wolfssl in /usr/local for 'make distcheck'

Author: SparkiDev

Makefile.am

@@ -36,7 +36,8 @@ 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@
 

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 --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_INSTALL_DIR="$ssldir"
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib -L$ssldir/lib64"
                 OPENSSL_LIBS="-lssl -lcrypto"
@@ -96,7 +98,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
     # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
 
     AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
-    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
+    echo "Trying link with OPENSSL_INSTALL_DIR=$OPENSSL_INSTALL_DIR; OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
         "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
 
     save_LIBS="$LIBS"
@@ -118,6 +120,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
     LDFLAGS="$save_LDFLAGS"
     LIBS="$save_LIBS"
 
+    AC_SUBST([OPENSSL_INSTALL_DIR])
     AC_SUBST([OPENSSL_INCLUDES])
     AC_SUBST([OPENSSL_LIBS])
     AC_SUBST([OPENSSL_LDFLAGS])

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_INSTALL_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_INSTALL_DIR="$wolfssldir"
                 WOLFSSL_INCLUDES="-I$wolfssldir/include"
                 WOLFSSL_LDFLAGS="-L$wolfssldir/lib"
                 WOLFSSL_LIBS="-lwolfssl"
@@ -99,7 +102,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
     # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
 
     AC_MSG_CHECKING([whether compiling and linking against wolfSSL works])
-    echo "Trying link with WOLFSSL_LDFLAGS=$WOLFSSL_LDFLAGS;" \
+    echo "Trying link with WOLFSSL_INSTALL_DIR=$WOLFSSL_INSTALL_DIR; WOLFSSL_LDFLAGS=$WOLFSSL_LDFLAGS;" \
         "WOLFSSL_LIBS=$WOLFSSL_LIBS; WOLFSSL_INCLUDES=$WOLFSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
 
     save_LIBS="$LIBS"
@@ -123,6 +126,7 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
     LDFLAGS="$save_LDFLAGS"
     LIBS="$save_LIBS"
 
+    AC_SUBST([WOLFSSL_INSTALL_DIR])
     AC_SUBST([WOLFSSL_INCLUDES])
     AC_SUBST([WOLFSSL_LIBS])
     AC_SUBST([WOLFSSL_LDFLAGS])