Don't do a test compile/link in m4_ax_check_openssl/wolfssl.

Doing a test compile/link is problematic if the user is cross-compiling.

Author: haydenroche5

configure.ac

@@ -52,7 +52,7 @@ AX_CHECK_OPENSSL(
 
 if test "x$have_openssl" = "xyes"; then
     LIBS="$LIBS $OPENSSL_LIBS"
-    CFLAGS="$CFLAGS $OPENSSL_INCLUDES"
+    CPPFLAGS="$CPPFLAGS $OPENSSL_INCLUDES"
     LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
 fi
 
@@ -64,7 +64,7 @@ AX_CHECK_WOLFSSL(
 
 if test "x$have_wolfssl" = "xyes"; then
     LIBS="$LIBS $WOLFSSL_LIBS"
-    CFLAGS="$CFLAGS $WOLFSSL_INCLUDES"
+    CPPFLAGS="$CPPFLAGS $WOLFSSL_INCLUDES"
     LDFLAGS="$LDFLAGS $WOLFSSL_LDFLAGS"
 fi
 

m4/m4_ax_check_openssl.m4

@@ -104,36 +104,15 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
                 AC_MSG_RESULT([no])
             fi
         done
-
-        # if the file wasn't found, well, go ahead and try the link anyway -- maybe
-        # it will just work!
     fi
 
-    # try the preprocessor and linker with our new flags,
-    # 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;" \
-        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
-
-    save_LIBS="$LIBS"
-    save_LDFLAGS="$LDFLAGS"
-    save_CPPFLAGS="$CPPFLAGS"
-    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
-    LIBS="$OPENSSL_LIBS $LIBS"
-    CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
-        [
-            AC_MSG_RESULT([yes])
-            $1
-        ], [
-            AC_MSG_RESULT([no])
-            $2
-        ])
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    if $found; then
+        AC_MSG_RESULT([yes])
+        $1
+    else
+        AC_MSG_RESULT([no])
+        $2
+    fi
 
     AC_SUBST([OPENSSL_INCLUDES])
     AC_SUBST([OPENSSL_LIBS])

m4/m4_ax_check_wolfssl.m4

@@ -86,38 +86,15 @@ AC_DEFUN([AX_CHECK_WOLFSSL], [
                 AC_MSG_RESULT([no])
             fi
         done
-
-        # if the file wasn't found, well, go ahead and try the link anyway --
-        # maybe it will just work!
     fi
 
-    # try the preprocessor and linker with our new flags,
-    # 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;" \
-        "WOLFSSL_LIBS=$WOLFSSL_LIBS; WOLFSSL_INCLUDES=$WOLFSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
-
-    save_LIBS="$LIBS"
-    save_LDFLAGS="$LDFLAGS"
-    save_CPPFLAGS="$CPPFLAGS"
-    LDFLAGS="$LDFLAGS $WOLFSSL_LDFLAGS"
-    LIBS="$WOLFSSL_LIBS $LIBS"
-    CPPFLAGS="$WOLFSSL_INCLUDES $CPPFLAGS"
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([
-#include <wolfssl/options.h>
-#include <wolfssl/ssl.h>], [wolfSSL_new(NULL)])],
-        [
-            AC_MSG_RESULT([yes])
-            $1
-        ], [
-            AC_MSG_RESULT([no])
-            $2
-        ])
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    if $found; then
+        AC_MSG_RESULT([yes])
+        $1
+    else
+        AC_MSG_RESULT([no])
+        $2
+    fi
 
     AC_SUBST([WOLFSSL_INCLUDES])
     AC_SUBST([WOLFSSL_LIBS])