From c7db28ef5a149cebe06d0dcce5441002bd4749dd Mon Sep 17 00:00:00 2001
From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com>
Date: Mon, 17 Mar 2025 12:15:12 -0600
Subject: [PATCH] merge --no-default-devid configure option into
 --enable-cryuptocb=no-default-devid

---
 configure.ac | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8b5c06165..0d60168d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8791,10 +8791,20 @@ AC_ARG_ENABLE([cryptodev],
 
 # Support for crypto callbacks
 AC_ARG_ENABLE([cryptocb],
-    [AS_HELP_STRING([--enable-cryptocb],[Enable crypto callbacks (default: disabled)])],
-    [ ENABLED_CRYPTOCB=$enableval ],
-    [ ENABLED_CRYPTOCB=no ]
-    )
+    [AS_HELP_STRING([--enable-cryptocb],
+        [Enable crypto callbacks (default: disabled). Use 'no-default-devid' to enable without a platform-specific default device ID])],
+[
+    case "$enableval" in
+        no-default-devid)
+            ENABLED_CRYPTOCB=yes
+            AM_CPPFLAGS="$AM_CPPFLAGS -DWC_NO_DEFAULT_DEVID"
+            ;;
+        *)
+            ENABLED_CRYPTOCB="$enableval"
+            ;;
+    esac
+],
+[ ENABLED_CRYPTOCB=no ])
 
 # Enable testing of cryptoCb using software crypto. On platforms where wolfCrypt tests
 # are used to test a custom cryptoCb, it may be desired to disable this so wolfCrypt tests
@@ -9265,14 +9275,6 @@ then
     AM_CFLAGS="$AM_CFLAGS -DALT_ECC_SIZE"
 fi
 
-AC_ARG_ENABLE([default-devid],
-    [AS_HELP_STRING([--disable-default-devid],[Disable default device ID (default: disabled)])],
-    [ if test "x$enableval" = "xno" ; then
-        AM_CFLAGS="$AM_CFLAGS -DWC_NO_DEFAULT_DEVID"
-      fi
-    ],
-    [ENABLED_DEFAULT_DEVID=yes])
-
 ################################################################################
 # Update ENABLE_* variables                                                    #
 ################################################################################