Use CFLAGS for RD to utilize in meta-wolfssl

configure.ac

@@ -124,12 +124,24 @@ AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
       ])
 
 # Replace default provider
+# Check if -DWOLFPROV_REPLACE_DEFAULT is in CFLAGS/CPPFLAGS first (for Yocto/CFLAGS usage)
+ENABLED_REPLACE_DEFAULT=no
+case " $CFLAGS $CPPFLAGS " in
+    *" -DWOLFPROV_REPLACE_DEFAULT "*|*" -DWOLFPROV_REPLACE_DEFAULT="*)
+        ENABLED_REPLACE_DEFAULT=yes
+        ;;
+esac
+
 AC_ARG_ENABLE([replace-default],
-    [AS_HELP_STRING([--enable-replace-default],[Build real libdefault.so from wp_default_replace.c (default: disabled).])],
+    [AS_HELP_STRING([--enable-replace-default],[Build real libdefault.so from wp_default_replace.c (default: disabled). Can also be enabled via -DWOLFPROV_REPLACE_DEFAULT in CFLAGS.])],
     [ ENABLED_REPLACE_DEFAULT=$enableval ],
-    [ ENABLED_REPLACE_DEFAULT=no ]
+    [ ]
     )
 
+if test "x$ENABLED_REPLACE_DEFAULT" = "xyes"; then
+    AM_CFLAGS="$AM_CFLAGS -DWOLFPROV_REPLACE_DEFAULT"
+fi
+
 AM_CONDITIONAL([BUILD_REPLACE_DEFAULT], [test "x$ENABLED_REPLACE_DEFAULT" = "xyes"])
 
 # Set OpenSSL lib directory for installing libdefault.so

scripts/utils-wolfprovider.sh

@@ -103,7 +103,7 @@ install_wolfprov() {
     fi
 
     if [ "$WOLFPROV_REPLACE_DEFAULT" = "1" ]; then
-        WOLFPROV_CONFIG_OPTS+=" --enable-replace-default"
+        WOLFPROV_CONFIG_CFLAGS="${WOLFPROV_CONFIG_CFLAGS} -DWOLFPROV_REPLACE_DEFAULT"
     fi
 
     if [ "${WOLFPROV_LEAVE_SILENT}" = "1" ]; then

test/unit.c

@@ -773,6 +773,7 @@ int main(int argc, char* argv[])
 
         osslLibCtx = OSSL_LIB_CTX_new();
 #ifdef WOLFPROV_REPLACE_DEFAULT_UNIT_TEST
+        PRINT_MSG("Testing unit tests in replace default mode");
         /* If enabled, directly load the default provider for unit testing
          * with default replace.  */
         osslProv = wp_load_default_provider_direct(osslLibCtx);